mergetools/diffmerge: support DiffMerge as a git mergetool
authorStefan Saasen <ssaasen@atlassian.com>
Sat, 12 Oct 2013 22:29:35 +0000 (09:29 +1100)
committerJonathan Nieder <jrnieder@gmail.com>
Sun, 13 Oct 2013 23:00:57 +0000 (16:00 -0700)
commitc5f424f...014488bd8a92b97f52bfe47823bc2128
tree56bc7d5...267bfe09027c8f6771d176bf02e346fbcopy hash to clipboard (tree)
parent22bbdde...fe5d5285def3dda76b300efd1363db1ecopy hash to clipboard (diff)
contrib/completion/git-completion.bash
git-mergetool--lib.sh
mergetools/diffmerge [new file with mode: 0644]