| commit | 25250f417235a1551c1be11d8d9a403835e75cdd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:26:10 +0000 (20 13:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Dec 2011 21:26:10 +0000 (20 13:26 -0800) | ||
| tree | 35bb0bbc72f034e3af2cb91296cbcf776eee96a2 | treesnapshot (tar.gz zip) |
| parent | 0b410e5c3b357520ddace5bff4c5bfa3699f9220 | commitdiff |
| parent | 8d68493f20db71abeb77adc251b2a116fe45cdaa | commitdiff |
Merge branch 'master' into next
* master:
t/t2023-checkout-m.sh: fix use of test_must_fail
commit: do not lose mergetag header when not amending
t0090: be prepared that 'wc -l' writes leading blanks
* master:
t/t2023-checkout-m.sh: fix use of test_must_fail
commit: do not lose mergetag header when not amending
t0090: be prepared that 'wc -l' writes leading blanks