git-merge: fix "fix confusion between tag and branch" for real
authorJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800)
commitde51faf...888505fa3d661d4c35f32ecaf9fa1087
treedb4405d...0a144e38ced9de7880746f55d6658701copy hash to clipboard (tree)
parentebdf7b9...2215946eff863e4da28f924178acea4fcopy hash to clipboard (diff)
git-merge.sh