When merging, we need to DTRT with our metadata.
-So we do this by running write-tree/read-tree etc. ourselves.
+Do this by running write-tree/read-tree etc. ourselves ?
For a source we're merging from, we make a version where the
-metadata we shouldn't be merging is removed.
+metadata we shouldn't be merging is removed ?
+Or something.
+Have discovered that specifying a custom merge driver for a file does
+not have any effect if the three-way-merge looks trivial based
+on looking at the file contents - at least, if you use git-merge.