##// END OF EJS Templates
tests: wider work around matching in test-narrow-shallow.t...
marmoute -
r46876:2e0ea4c4 default draft
parent child Browse files
Show More
@@ -107,6 +107,12 b' XXX 10 files updated.'
107 merging d2/f6 (?)
107 merging d2/f6 (?)
108 merging d2/f7 (?)
108 merging d2/f7 (?)
109 3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?)
109 3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?)
110 4 files updated, 6 files merged, 0 files removed, 0 files unresolved (?)
111 5 files updated, 5 files merged, 0 files removed, 0 files unresolved (?)
112 6 files updated, 4 files merged, 0 files removed, 0 files unresolved (?)
113 7 files updated, 3 files merged, 0 files removed, 0 files unresolved (?)
114 8 files updated, 2 files merged, 0 files removed, 0 files unresolved (?)
115 9 files updated, 1 files merged, 0 files removed, 0 files unresolved (?)
110 10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?)
116 10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?)
111 $ cat d2/f7 d2/f8
117 $ cat d2/f7 d2/f8
112 d2/f7 rev3
118 d2/f7 rev3
General Comments 0
You need to be logged in to leave comments. Login now