--- a/tests/test-up-local-change.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-up-local-change.t Wed Nov 25 14:25:26 2015 -0800
@@ -50,11 +50,11 @@
b: remote created -> g
getting b
a: versions differ -> m (premerge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a: versions differ -> m (merge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0
@@ -74,11 +74,11 @@
b: other deleted -> r
removing b
a: versions differ -> m (premerge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
a: versions differ -> m (merge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0
@@ -106,11 +106,11 @@
b: remote created -> g
getting b
a: versions differ -> m (premerge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a: versions differ -> m (merge)
- picked tool 'true' for a (binary False symlink False)
+ picked tool 'true' for a (binary False symlink False changedelete False)
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0