Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-changedelete.t
changeset 27557 28b5c4fcf48d
parent 27164 88d5db4b155c
child 27599 ad5966de3c9a 
--- a/tests/test-merge-changedelete.t	Tue Dec 29 18:11:14 2015 -0500
+++ b/tests/test-merge-changedelete.t	Sun Dec 27 15:24:48 2015 -0800
@@ -460,7 +460,7 @@
   --- file3 ---
   3
   changed2
-  $ diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
+  $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
 
 
 Force prompts
@@ -583,7 +583,7 @@
   >         hg resolve --tool ":$tool" --all --config ui.interactive=True
   >         status > "$TESTTMP/compare.status" 2>&1
   >         echo '--- diff of status ---'
-  >         if diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then
+  >         if cmp "$TESTTMP/$tool.status" "$TESTTMP/compare.status" || diff -U8 "$TESTTMP/$tool.status" "$TESTTMP/compare.status"; then
   >             echo '(status identical)'
   >         fi
   >         lasttool="$tool"
@@ -868,7 +868,7 @@
   --- file3 ---
   3
   changed1
-  $ diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
+  $ cmp $TESTTMP/fail.status $TESTTMP/prompt.status || diff -U8 $TESTTMP/fail.status $TESTTMP/prompt.status
 
 Choose to merge all files
Mercurial