| commit | 52fecab20cf28f4b5621e502a265ba551a26877e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 26 Apr 2015 01:29:44 +0000 (25 18:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:19:21 +0000 (29 13:19 -0700) | ||
| tree | 4df960a94b182844d4f7f1d58577cbaa271b033f | treesnapshot (tar.gz zip) |
| parent | 018b3fbc7e66439786492662b88cb34d7d000621 | commitdiff |
merge: extract prepare_merge_message() logic out
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |