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.diff_initial..side | |
| parent | 254db3035ccf3413ab997c4baf2d3b8b7bb4c054 (diff) | |
| parent | c5cbb27cb5f0a94ac5d0882778a00add829ad9d9 (diff) | |
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.diff_initial..side')
0 files changed, 0 insertions, 0 deletions