X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=DESIGN;fp=DESIGN;h=66003b3c74b20ad61dcd50a4c16b24b7f02b7cc7;hp=b9af16cef0a46d512d7b6d3a998058aa4461a538;hb=f0ee45a14d7110c479a8a927c9548fb805159395;hpb=fd8435b698b2a41df6227d4d7e83cfd0eccbe03d

diff --git a/DESIGN b/DESIGN
index b9af16c..66003b3 100644
--- a/DESIGN
+++ b/DESIGN
@@ -189,6 +189,10 @@ Stack reordering op ?  auto adjust deps
 
 
 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.