[darcs-users] Re: [darcs] pull is silent about conflicts

[Peter Simons]

David Roundy writes:

 > I'd either have to figure out how to generate valid diff -u output
 > myself [...], or I'd have to generate the two files and run diff
 > itself on them, and I've not figured out which is nicer.

Just running an external diff utility on on-the-fly-generated files is
probably the best idea. Then people can use _any_ diff utility they
like. (wdiff is useful at times, for instance.)

If you really want to implement it internally, I think the GNU
diffutils come with all the core functionality in one library. You
could use that to generate all kinds of diff outputs, I think.

Peter