Mercurial > hg

comparison tests/test-subrepo.t @ 31772:3433bf56b768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo: update output for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 02 Apr 2017 02:24:09 -0400
parents 2915cc1d3429
children 746e12a767b3 55681baf4cf9
comparison
equal deleted inserted replaced
31771:5e92ba77793c 31772:3433bf56b768
309 searching for copies back to rev 2 309 searching for copies back to rev 2
310 resolving manifests 310 resolving manifests
311 branchmerge: True, force: False, partial: False 311 branchmerge: True, force: False, partial: False
312 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 312 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
313 preserving t for resolve of t 313 preserving t for resolve of t
314 starting 4 threads for background file closing (?)
314 t: versions differ -> m (premerge) 315 t: versions differ -> m (premerge)
315 picked tool ':merge' for t (binary False symlink False changedelete False) 316 picked tool ':merge' for t (binary False symlink False changedelete False)
316 merging t 317 merging t
317 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a 318 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
318 t: versions differ -> m (merge) 319 t: versions differ -> m (merge)