Comments
Patch
@@ -19,7 +19,7 @@
$ hg diff --nodates -r 0 -r 2
- $ hg diff --git -r 0 -r 1
+ $ hg diff --git -a -r 0 -r 1
diff --git a/binfile.bin b/binfile.bin
index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
GIT binary patch
@@ -44,7 +44,7 @@
diff --git a/binfile.bin b/binfile.bin
Binary file binfile.bin has changed
- $ HGPLAIN=1 hg diff --config diff.nobinary=True --git -r 0 -r 1
+ $ HGPLAIN=1 hg diff --config diff.nobinary=True --git -a -r 0 -r 1
diff --git a/binfile.bin b/binfile.bin
index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
GIT binary patch
@@ -64,7 +64,7 @@
- $ hg diff --git -r 2 -r 3
+ $ hg diff --git -a -r 2 -r 3
diff --git a/binfile.bin b/nonbinfile
copy from binfile.bin
copy to nonbinfile
@@ -342,7 +342,7 @@ Binary diff:
$ cp "$TESTDIR/binfile.bin" .
$ hg add binfile.bin
- $ hg diff --git > b.diff
+ $ hg diff --git -a > b.diff
$ cat b.diff
diff --git a/binfile.bin b/binfile.bin
new file mode 100644
@@ -131,7 +131,7 @@ Test --eol and binary patches
$ hg ci -Am addb
adding b
$ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")'
- $ hg diff --git > bin.diff
+ $ hg diff --git -a > bin.diff
$ hg revert --no-backup b
binary patch with --eol