Mercurial Mercurial > mercurial / 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-force.t
changeset 27557 28b5c4fcf48d
parent 27163 27b89a0957ec
child 27599 ad5966de3c9a 
--- a/tests/test-merge-force.t	Tue Dec 29 18:11:14 2015 -0500
+++ b/tests/test-merge-force.t	Sun Dec 27 15:24:48 2015 -0800
@@ -779,4 +779,4 @@
   warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
   [1]
   $ checkstatus > $TESTTMP/status2 2>&1
-  $ diff -U8 $TESTTMP/status1 $TESTTMP/status2
+  $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2
mercurial