diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:11 -0700 |
| commit | 0eb2774b25641d797ffb09a884b85e93a6563648 (patch) | |
| tree | 98b8d8b4078cc8922f9abc9374c04760a7636475 /git-mergetool.sh | |
| parent | Merge branch 'bb/unicode-12.1-reiwa' into maint (diff) | |
| parent | p4 unshelve: fix "Not a valid object name HEAD0" on Windows (diff) | |
| download | tgif-0eb2774b25641d797ffb09a884b85e93a6563648.tar.xz | |
Merge branch 'mm/p4-unshelve-windows-fix' into maint
The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.
* mm/p4-unshelve-windows-fix:
p4 unshelve: fix "Not a valid object name HEAD0" on Windows
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions