##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: cleanup of tests that ended up outside $TESTTMP...
Mads Kiilerich -
r16911:39d38f16 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -117,7 +117,6 showconfig with multiple arguments
117
117
118 HGPLAIN
118 HGPLAIN
119
119
120 $ cd ..
121 $ p=`pwd`
120 $ p=`pwd`
122 $ echo "[ui]" > $HGRC
121 $ echo "[ui]" > $HGRC
123 $ echo "debug=true" >> $HGRC
122 $ echo "debug=true" >> $HGRC
Show file before | Show file after | Hide comments
@@ -25,6 +25,3 Update with local changes across a file
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
26 use 'hg resolve' to retry unresolved file merges
26 use 'hg resolve' to retry unresolved file merges
27 [1]
27 [1]
28
29 $ cd ..
30
General Comments 0
You need to be logged in to leave comments. Login now