diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:20:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:20:32 -0700 |
| commit | e1eb84cccb927834acae58ec2c0f727c7bf184c7 (patch) | |
| tree | 59431a150dcd01bfe822c939311a6a4d6560a72a /git-gui/lib/merge.tcl | |
| parent | 54a9f14743748ada4bef3caffa45c6170ae4da32 (diff) | |
| parent | f357e5de31595c28a303aaf5443c26f492441a6f (diff) | |
| download | git-e1eb84cccb927834acae58ec2c0f727c7bf184c7.tar.gz git-e1eb84cccb927834acae58ec2c0f727c7bf184c7.tar.xz | |
Merge branch 'kd/mailinfo-quoted-string' into maint
An author name, that spelled a backslash-quoted double quote in the
human readable part "My \"double quoted\" name", was not unquoted
correctly while applying a patch from a piece of e-mail.
* kd/mailinfo-quoted-string:
mailinfo: unescape quoted-pair in header fields
t5100-mailinfo: replace common path prefix with variable
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions