Irmin lets me provide a merge function for individual keys: val merge: Path.t -> t option Merge.t
Is there any way to merge whole commits? Each of my commits is a collection of files, but files can refer to each other. For example, I might start with a single file representing a project: - Test CueKeeper On one branch, I delete this. On another, I add an action so that I have two files: - Test CueKeeper - Test on IE (parent: Test CueKeeper) When merged, the result needs to include the parent, even though it was deleted in one branch and not touched in the other. Can I do this? -- Dr Thomas Leonard http://0install.net/ GPG: 9242 9807 C985 3C07 44A6 8B9A AE07 8280 59A5 3CC1 GPG: DA98 25AE CAD0 8975 7CDA BD8E 0713 3F96 CA74 D8BA _______________________________________________ MirageOS-devel mailing list [email protected] http://lists.xenproject.org/cgi-bin/mailman/listinfo/mirageos-devel
