merge-recursive: check for file level conflicts then get new name
[git/debian.git] / t / t5100 / quoted-string.expect
blobcab1bcebf99dc8a4911b625127e7aa315118c615
1 Author: Author "The Author" Name
2 Email: somebody@example.com
3 Subject: testing quoted-pair
4 Date: Sun, 25 May 2008 00:38:18 -0700