summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2007-06-06Fix typo in git-mergetoolLibravatar Josh Triplett1-1/+1
2007-03-29mergetool: Clean up description of files and prompts for merge resolutionsLibravatar Theodore Ts'o1-12/+15
2007-03-29mergetool: Make git-rm quiet when resolving a deleted file conflictLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: Add support for Apple Mac OS X's opendiff commandLibravatar Theodore Ts'o1-2/+14
2007-03-29mergetool: Fix abort command when resolving symlinks and deleted filesLibravatar Theodore Ts'o1-4/+4
2007-03-29mergetool: Remove spurious error message if merge.tool config option not setLibravatar Theodore Ts'o1-1/+1
2007-03-29mergetool: factor out common codeLibravatar Theodore Ts'o1-42/+36
2007-03-29mergetool: portability fix: don't use reserved word functionLibravatar Theodore Ts'o1-5/+5
2007-03-29mergetool: portability fix: don't assume true is in /binLibravatar Theodore Ts'o1-2/+2
2007-03-29mergetool: Don't error out in the merge case where the local file is deletedLibravatar Theodore Ts'o1-6/+5
2007-03-29mergetool: Replace use of "echo -n" with printf(1) to be more portableLibravatar Theodore Ts'o1-14/+12
2007-03-18mergetool: print an appropriate warning if merge.tool is unknownLibravatar Theodore Ts'o1-4/+9
2007-03-18mergetool: Add support for vimdiff.Libravatar James Bowes1-3/+5
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programLibravatar Theodore Ts'o1-0/+352