summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorLibravatar Theodore Ts'o <tytso@mit.edu>2007-03-06 00:05:16 -0500
committerLibravatar Theodore Ts'o <tytso@mit.edu>2007-03-13 20:14:05 -0400
commitc4b4a5af1604a7546c0b0786e47bcff8a47a6039 (patch)
tree31a585ea3f75de124e44ab415316a16857e8b6b7 /Documentation/git-read-tree.txt
parentMerge branch 'master' of git://repo.or.cz/git-gui (diff)
downloadtgif-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 'Documentation/git-read-tree.txt')
0 files changed, 0 insertions, 0 deletions