Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge1 @ 3988:9dcf9d45cab8
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 26 Dec 2006 14:17:48 +0100 |
| parents | 49966b5ab16f |
| children | ccfe423d3d0a |
line wrap: on
line diff
--- a/tests/test-merge1 Sun Dec 24 22:28:01 2006 +0100 +++ b/tests/test-merge1 Tue Dec 26 14:17:48 2006 +0100 @@ -25,7 +25,7 @@ env HGMERGE=../merge hg merge 1 hg diff --nodates hg status -cd ..; /bin/rm -rf t +cd ..; rm -r t mkdir t cd t @@ -48,7 +48,7 @@ env HGMERGE=../merge hg merge -f 1 hg diff --nodates hg status -cd ..; /bin/rm -rf t +cd ..; rm -r t echo %% mkdir t @@ -77,7 +77,7 @@ env HGMERGE=../merge hg merge -f 2 hg diff --nodates hg status -cd ..; /bin/rm -rf t +cd ..; rm -r t mkdir t cd t @@ -101,4 +101,3 @@ env HGMERGE=../merge hg merge -f 2 hg diff --nodates hg status -cd ..; /bin/rm -rf t