localwiki/sapling — Issue #9: Perfect three-way merging output
Author: philipn
Created: 2011-11-24 09:48:48+00:00
State: open

Output:

Edit conflict! Your version:I changed the headline

Edit conflict! Other version:Different headline

Does diffing still work? Edit conflict! Other version:I added a different sentence here. Edit conflict! Your version:I added a sentence here.

As you can see "Your version" is not always first, which it probably should be, and even though the conflict was the entire h1 element in the first one, it puts the warning below that element. Should really be above it.