Mercurial > hg

comparison tests/test-merge-criss-cross.t @ 31766:bdcaf612e75a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add globs for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 01 Apr 2017 14:48:39 -0400
parents 41f6af50c0d8
children 4441705b7111
comparison
equal deleted inserted replaced
31765:264baeef3588 31766:bdcaf612e75a
114 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 114 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
115 [1] 115 [1]
116 116
117 $ f --dump --recurse * 117 $ f --dump --recurse *
118 d2: directory with 2 files 118 d2: directory with 2 files
119 d2/f3: 119 d2/f3: (glob)
120 >>> 120 >>>
121 0 base 121 0 base
122 <<< 122 <<<
123 d2/f4: 123 d2/f4: (glob)
124 >>> 124 >>>
125 0 base 125 0 base
126 <<< 126 <<<
127 f1: 127 f1:
128 >>> 128 >>>
220 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 220 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
221 (branch merge, don't forget to commit) 221 (branch merge, don't forget to commit)
222 222
223 $ f --dump --recurse * 223 $ f --dump --recurse *
224 d2: directory with 2 files 224 d2: directory with 2 files
225 d2/f3: 225 d2/f3: (glob)
226 >>> 226 >>>
227 0 base 227 0 base
228 <<< 228 <<<
229 d2/f4: 229 d2/f4: (glob)
230 >>> 230 >>>
231 0 base 231 0 base
232 <<< 232 <<<
233 f1: 233 f1:
234 >>> 234 >>>
306 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 306 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
307 (branch merge, don't forget to commit) 307 (branch merge, don't forget to commit)
308 308
309 $ f --dump --recurse * 309 $ f --dump --recurse *
310 d2: directory with 2 files 310 d2: directory with 2 files
311 d2/f3: 311 d2/f3: (glob)
312 >>> 312 >>>
313 0 base 313 0 base
314 <<< 314 <<<
315 d2/f4: 315 d2/f4: (glob)
316 >>> 316 >>>
317 0 base 317 0 base
318 <<< 318 <<<
319 f1: 319 f1:
320 >>> 320 >>>