| commit | 1cf32f4d54d7db0da9b2fb35cdd277f9ab7ae0af | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 26 Apr 2015 01:34:22 +0000 (25 18:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:24:40 +0000 (29 13:24 -0700) | ||
| tree | 1196f256f830378ed4e1fdd5c7d6414a5a2f80b8 | treesnapshot (tar.gz zip) |
| parent | 52fecab20cf28f4b5621e502a265ba551a26877e | commitdiff |
merge: make collect_parents() auto-generate the merge message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |