merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[git] / t / t5100 / info0010
1 Author: Lukas Sandström
2 Email: lukass@etek.chalmers.se
3 Subject: git-mailinfo: Fix getting the subject from the body
4 Date: Thu, 10 Jul 2008 23:41:33 +0200
5