--- a/tests/test-merge1 Tue Oct 10 00:02:30 2006 +0200
+++ b/tests/test-merge1 Wed Oct 11 16:35:09 2006 +0200
@@ -23,6 +23,8 @@
echo This is file b1 > b
echo %% no merges expected
env HGMERGE=../merge hg merge 1
+hg diff --nodates
+hg status
cd ..; /bin/rm -rf t
mkdir t
@@ -44,6 +46,8 @@
env HGMERGE=../merge hg merge 1
echo %% merge of b expected
env HGMERGE=../merge hg merge -f 1
+hg diff --nodates
+hg status
cd ..; /bin/rm -rf t
echo %%
@@ -71,6 +75,8 @@
env HGMERGE=../merge hg merge 2
echo %% merge expected!
env HGMERGE=../merge hg merge -f 2
+hg diff --nodates
+hg status
cd ..; /bin/rm -rf t
mkdir t
@@ -93,4 +99,6 @@
env HGMERGE=../merge hg merge 2
echo %% merge of b expected
env HGMERGE=../merge hg merge -f 2
+hg diff --nodates
+hg status
cd ..; /bin/rm -rf t