diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
| commit | 2c8c407d0a3237a15b4c64249fca50cde4f16115 (patch) | |
| tree | 3b6863d0296fabbdf2ff4288b22689efc779466e /git-merge-resolve.sh | |
| parent | Merge branch 'js/pull-rebase-type-shorthand' (diff) | |
| parent | t4150: fix broken test for am --scissors (diff) | |
| download | tgif-2c8c407d0a3237a15b4c64249fca50cde4f16115.tar.xz | |
Merge branch 'ar/t4150-am-scissors-test-fix'
Test fix.
* ar/t4150-am-scissors-test-fix:
t4150: fix broken test for am --scissors
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions