--- a/tests/test-contrib.t Tue Jul 29 11:55:01 2014 -0700
+++ b/tests/test-contrib.t Tue Aug 05 14:56:25 2014 -0700
@@ -143,23 +143,11 @@
$ echo not other >> conflict-local
$ echo end >> conflict-local
$ echo end >> conflict-other
+
$ python simplemerge -p conflict-local base conflict-other
base
<<<<<<< conflict-local
not other
- =======
- other
- >>>>>>> conflict-other
- end
- warning: conflicts during merge.
- [1]
-
---no-minimal
-
- $ python simplemerge -p --no-minimal conflict-local base conflict-other
- base
- <<<<<<< conflict-local
- not other
end
=======
other
@@ -174,10 +162,11 @@
base
<<<<<<< foo
not other
+ end
=======
other
+ end
>>>>>>> conflict-other
- end
warning: conflicts during merge.
[1]
@@ -187,10 +176,11 @@
base
<<<<<<< foo
not other
+ end
=======
other
+ end
>>>>>>> bar
- end
warning: conflicts during merge.
[1]
@@ -231,7 +221,7 @@
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
- --no-minimal do not try to minimize conflict regions
+ --no-minimal no effect (DEPRECATED)
-h --help display help and exit
-q --quiet suppress output
@@ -251,7 +241,7 @@
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
- --no-minimal do not try to minimize conflict regions
+ --no-minimal no effect (DEPRECATED)
-h --help display help and exit
-q --quiet suppress output
[1]
@@ -272,7 +262,7 @@
-L --label labels to use on conflict markers
-a --text treat all files as text
-p --print print results instead of overwriting LOCAL
- --no-minimal do not try to minimize conflict regions
+ --no-minimal no effect (DEPRECATED)
-h --help display help and exit
-q --quiet suppress output
[1]