diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:39 -0700 |
| commit | bba1a5559cd0015165563fd01d23bbd5e52bea72 (patch) | |
| tree | 52996b6408a653c15b720e3b7e04292e8f53e6b5 /commit.c | |
| parent | Merge branch 'sg/httpd-test-unflake' (diff) | |
| parent | t6036: fix broken && chain in sub-shell (diff) | |
| download | git-bba1a5559cd0015165563fd01d23bbd5e52bea72.tar.gz git-bba1a5559cd0015165563fd01d23bbd5e52bea72.zip | |
Merge branch 'en/t6036-recursive-corner-cases'
Tests to cover more D/F conflict cases have been added for
merge-recursive.
* en/t6036-recursive-corner-cases:
t6036: fix broken && chain in sub-shell
t6036: add lots of detail for directory/file conflicts in recursive case
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions