On 10/03/2012 10:27 PM, Bob Bell wrote:> what I'd really like is to display the merges >> file, bracketing the conflicting changes, NOT including when FILE0 and >> FILE1 made identical changes, but when there *IS* a conflicting change, >> I'd like to see FILE0, FILE1 *and* FILE2/FILEC.
Something like that sounds plausible, yes. Can you give a brief example of input files, and what the output would look like, compared to what it looks like with the various options now? That'd help us understand exactly what you're proposing. Implementing the proposal would also help, but I've found the hardest part is often writing the documentation.
