git-merge-recursive: learn to honor merge.conflictstyle
[git] / t / t5100 / info-from.expect
2008-08-20  Jeff Kingmailinfo: avoid violating strbuf assertion