diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-06 11:22:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 11:22:55 -0800 |
| commit | de51faf3888505fa3d661d4c35f32ecaf9fa1087 (patch) | |
| tree | db4405db0a144e38ced9de7880746f55d6658701 /ppc | |
| parent | ebdf7b952215946eff863e4da28f924178acea4f (diff) | |
| download | git-de51faf3888505fa3d661d4c35f32ecaf9fa1087.tar.gz git-de51faf3888505fa3d661d4c35f32ecaf9fa1087.tar.xz | |
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>
Diffstat (limited to 'ppc')
0 files changed, 0 insertions, 0 deletions