git-merge: fix confusion between tag and branch
authorJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 00:58:30 +0000 (16:58 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 00:58:30 +0000 (16:58 -0800)
commit3683dc5...9afaf88d00e55c9e6c67a2160ca7fc9c
tree644cbf2...3f249555f275196515a23479e3c5c223copy hash to clipboard (tree)
parent22b1c7e...01ef5bc7f81e620bb88a6fad79c1c605copy hash to clipboard (diff)
git-merge.sh