diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:24 -0700 |
| commit | 41d910ea6ce58b2d7322f7bff5877ead33f34b8c (patch) | |
| tree | 9c9a2ef93a7e42277850aa5571c8ad8f66bb3ba6 /t/t6047-diff3-conflict-markers.sh | |
| parent | Merge branch 'am/mingw-poll-fix' into maint (diff) | |
| parent | show_one_mergetag: print non-parent in hex form. (diff) | |
| download | tgif-41d910ea6ce58b2d7322f7bff5877ead33f34b8c.tar.xz | |
Merge branch 'hd/show-one-mergetag-fix' into maint
"git show" and others gave an object name in raw format in its
error output, which has been corrected to give it in hex.
* hd/show-one-mergetag-fix:
show_one_mergetag: print non-parent in hex form.
Diffstat (limited to 't/t6047-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions