Multi-backend merge driver.
authorJunio C Hamano <junkio@cox.net>
Thu, 8 Sep 2005 20:47:12 +0000 (13:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 01:30:41 +0000 (18:30 -0700)
commit91063bb...6c4187184e94ebc4ab2b807e6d53cd0a
tree473b699...8570ca750aa44689ca63875ff10136bfcopy hash to clipboard (tree)
parentbb97a2a...04e0afdd686ed9f18fed2ddc15833540copy hash to clipboard (diff)
Makefile
git-commit.sh
git-merge-octopus.sh [new file with mode: 0755]
git-merge-resolve.sh [new file with mode: 0755]
git-merge.sh [new file with mode: 0755]