![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 6 Dec 2006 19:22:55 +0000 (11:22 -0800) | ||
| commit | de51faf3888505fa3d661d4c35f32ecaf9fa1087 | |
| tree | db4405db0a144e38ced9de7880746f55d6658701 | tree | snapshot |
| parent | ebdf7b952215946eff863e4da28f924178acea4f | commit | diff |
git-merge: fix "fix confusion between tag and branch" for real
An earlier commit 3683dc5a broke the merge message generation with
a careless use of && where it was not needed, breaking the merge
message for cases where non branches are given.
Signed-off-by: Junio C Hamano <junkio@cox.net>
An earlier commit 3683dc5a broke the merge message generation with
a careless use of && where it was not needed, breaking the merge
message for cases where non branches are given.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diff | blob | history |