| commit | 5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:25 +0000 (16 16:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:25 +0000 (16 16:47 -0700) | ||
| tree | 36d150c5b966cbfc9f06e6d2a67554e6aafb4a84 | treesnapshot (tar.gz zip) |
| parent | 6affdbe677c4b2b8547bd9aa471464dd31a94a1c | commitdiff |
| parent | 65969d43d10512a44f5e7248e4404b946d1d0d9f | commitdiff |
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
* js/maint-merge-use-prepare-commit-msg-hook:
merge: honor prepare-commit-msg hook
| builtin/merge.c | diff1 | diff2 | blobhistory |