##// END OF EJS Templates
patch: remove applydiff() useless updatedir and rejmerge arguments
patch: remove applydiff() useless updatedir and rejmerge arguments

File last commit:

r6467:65029a3a default
r7147:94cf0d1f default
Show More
test-diff-unified.out
49 lines | 550 B | text/plain | TextLexer
/ tests / test-diff-unified.out
Patrick Mezard
Let --unified default to diff.unified (issue 1076)
r6467 adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
c
a
a
-b
+dd
a
a
c
% invalid --unified
abort: diff context lines count must be an integer, not 'foo'
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
% diff.unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
% diff.unified=2 --unified=1
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -4,3 +4,3 @@
a
-b
+dd
a
% invalid diff.unified
abort: diff context lines count must be an integer, not 'foo'