Commit 651bfd699c8eaa8ca36de0d0d992a1832d71df8f

Edward Thomson 2015-11-09T08:24:47

recursive: test conflict output during recursive merge