--- a/tests/test-rename-merge2.t Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-rename-merge2.t Wed Nov 25 14:25:26 2015 -0800
@@ -90,16 +90,16 @@
preserving rev for resolve of rev
a: remote unchanged -> k
b: remote copied from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -130,16 +130,16 @@
a: remote is newer -> g
getting a
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -169,16 +169,16 @@
preserving rev for resolve of rev
removing a
b: remote moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -206,16 +206,16 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -244,11 +244,11 @@
b: remote created -> g
getting b
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -275,11 +275,11 @@
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
preserving rev for resolve of rev
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -310,11 +310,11 @@
b: remote created -> g
getting b
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -340,11 +340,11 @@
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
preserving rev for resolve of rev
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -368,20 +368,20 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
b: both renamed from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -418,11 +418,11 @@
c: remote created -> g
getting c
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -447,20 +447,20 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -487,20 +487,20 @@
a: other deleted -> r
removing a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -526,20 +526,20 @@
a: remote is newer -> g
getting a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -566,20 +566,20 @@
a: other deleted -> r
removing a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -605,20 +605,20 @@
a: remote is newer -> g
getting a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -644,20 +644,20 @@
preserving rev for resolve of rev
a: remote unchanged -> k
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -682,24 +682,24 @@
preserving b for resolve of b
preserving rev for resolve of rev
a: prompt deleted/changed -> m (premerge)
- picked tool ':prompt' for a (binary False symlink False)
+ picked tool ':prompt' for a (binary False symlink False changedelete True)
remote changed a which local deleted
use (c)hanged version or leave (d)eleted? c
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -725,24 +725,24 @@
preserving b for resolve of b
preserving rev for resolve of rev
a: prompt changed/deleted -> m (premerge)
- picked tool ':prompt' for a (binary False symlink False)
+ picked tool ':prompt' for a (binary False symlink False changedelete True)
local changed a which remote deleted
use (c)hanged version or (d)elete? c
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -771,20 +771,20 @@
preserving rev for resolve of rev
removing a
b: remote moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
b: remote moved from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -812,20 +812,20 @@
preserving b for resolve of b
preserving rev for resolve of rev
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
b: local copied/moved from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
@@ -860,16 +860,16 @@
c: remote created -> g
getting c
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False)
+ picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b and a to b
my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
merging rev
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False)
+ picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0