| commit | 770380156dd06cd03d83957d55484f4a98ad284f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 26 Apr 2015 01:39:43 +0000 (25 18:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:26:03 +0000 (29 13:26 -0700) | ||
| tree | 6d0dcb00db9ec2cab9e62a2d7fea1c5d445de651 | treesnapshot (tar.gz zip) |
| parent | 1cf32f4d54d7db0da9b2fb35cdd277f9ab7ae0af | commitdiff |
merge: decide if we auto-generate the message early in collect_parents()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |