merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t5100 / info0009
1 Author: F U Bar
2 Email: f.u.bar@example.com
3 Subject: updates
4 Date: Mon, 17 Sep 2001 00:00:00 +0900
5