##// END OF EJS Templates
tests: .hg/merge is a directory, so use `test -d`...
Martin von Zweigbergk -
r36794:c164a3a2 default
parent child Browse files
Show More
@@ -461,5 +461,5 b' Make sure merge state is cleaned up afte'
461 note: rebase of 1:fdaca8533b86 created no changes to commit
461 note: rebase of 1:fdaca8533b86 created no changes to commit
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
463 $ hg resolve --list
463 $ hg resolve --list
464 $ test -f .hg/merge
464 $ test -d .hg/merge
465 [1]
465 [1]
General Comments 0
You need to be logged in to leave comments. Login now