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

diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index 04a9da82c9cb7a2ab24d86efb0e6c6aafdd55f3b..526ccb344d231fb978f53b80deb17ec6c8fed368 100644 (file)
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
@@ -40,4 +40,3 @@
 
 
 #endif /* #if !defined(XINCLUDE_H) */
-