Theodore Ts'o c4b4a5af16 Add git-mergetool to run an appropriate merge conflict resolution program ...

The git-mergetool program can be used to automatically run an appropriate
merge resolution program to resolve merge conflicts.  It will automatically
run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

2007-03-13 20:14:05 -04:00

7.6 KiB

Executable File

Raw Blame History

View Raw