[Gnu-arch-users] Merge tools that support .rej .orig rejects/conflicts

[Martin Langhoff]

Hallo,

dealing with conflicts in merges is proving somewhat tricky for this
CVS refugee. I haven't been able to find how to make xxdiff or mgdiff
(or meld, or imediff2 or whatever) deal with .rej files.

Granted, there's a lot that can be done with a wrapper script... but
isn't there one already?

cheers,



martin