merge.conflictstyle: choose between "merge" and "diff3 -m" styles

diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index be837bb98ded356bfc10b3c371921b1b7bbb56bf..e0c67740a5ef85aaa3edc9a4514da72c92ce30ec 100755 (executable)
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -33,6 +33,8 @@ mode
 non git (1)
 non git (2)
 non git (3)
+incomplete (1)
+incomplete (2)
 EOF
 
 test_done