| commit | 6458c4bcc97829b491a7d8fb8090f22c27514c16 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Feb 2011 23:27:03 +0000 (22 15:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Feb 2011 23:27:03 +0000 (22 15:27 -0800) | ||
| tree | dc5641a84fadd5065065e483f60ff7aac03522fb | treesnapshot (tar.gz zip) |
| parent | 09acf6f323d029581abe49782e5e3159ce75d11b | commitdiff |
| parent | 65969d43d10512a44f5e7248e4404b946d1d0d9f | commitdiff |
Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into next
* 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 |