diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
| commit | a28e876b9dafe3f042ae057be84613f4504822b3 (patch) | |
| tree | 521b4535fcf72c88b7659517707e2b0056c2eaa0 /t/t0200-gettext-basic.sh | |
| parent | f7153344cf2b4fac1ca900ed485de9282a66d6e9 (diff) | |
| parent | 6a143aa2b23b97fa8363e2f4fd16f23b4c5b104d (diff) | |
| download | git-a28e876b9dafe3f042ae057be84613f4504822b3.tar.gz git-a28e876b9dafe3f042ae057be84613f4504822b3.tar.xz | |
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint
* jn/unpack-trees-checkout-m-carry-deletion:
checkout -m: attempt merge when deletion of path was staged
unpack-trees: use 'cuddled' style for if-else cascade
unpack-trees: simplify 'all other failures' case
Diffstat (limited to 't/t0200-gettext-basic.sh')
0 files changed, 0 insertions, 0 deletions