diff options
| author |  Theodore Ts'o <tytso@mit.edu> | 2007-03-06 00:05:16 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-13 20:14:05 -0400 |
| commit | c4b4a5af1604a7546c0b0786e47bcff8a47a6039 (patch) | |
| tree | 31a585ea3f75de124e44ab415316a16857e8b6b7 /builtin-push.c | |
| parent | Merge branch 'master' of git://repo.or.cz/git-gui (diff) | |
| download | tgif-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.xz | |
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>
Diffstat (limited to 'builtin-push.c')
0 files changed, 0 insertions, 0 deletions