diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
| commit | 9674e7a333150d4f4a4752b25b4066bcd0406ddf (patch) | |
| tree | c64c5d9732346ddf2f6084154e98f8cb0cc8ee6a /t/t4013/diff.noellipses-whatchanged_--root_master | |
| parent | Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maint (diff) | |
| parent | rev-parse: --show-superproject-working-tree should work during a merge (diff) | |
| download | tgif-9674e7a333150d4f4a4752b25b4066bcd0406ddf.tar.xz | |
Merge branch 'sm/show-superproject-while-conflicted' into maint
A corner-case bugfix.
* sm/show-superproject-while-conflicted:
rev-parse: --show-superproject-working-tree should work during a merge
Diffstat (limited to 't/t4013/diff.noellipses-whatchanged_--root_master')
0 files changed, 0 insertions, 0 deletions