##// END OF EJS Templates
update: add a test for `--merge` overriding the "abort" config...
marmoute -
r49235:51f52190 default
parent child Browse files
Show More
@@ -221,6 +221,11 b' Cases are run as shown in that table, ro'
221 parent=1
221 parent=1
222 M foo
222 M foo
223
223
224 $ revtest '--merge none dirty linear' dirty 1 2 --merge
225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 parent=2
227 M foo
228
224 $ revtest 'none dirty linear' dirty 1 2 --clean
229 $ revtest 'none dirty linear' dirty 1 2 --clean
225 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
230 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 parent=2
231 parent=2
General Comments 0
You need to be logged in to leave comments. Login now