view tests/test-issue1175.out @ 11977:db2a291e25e9

tests: unify test-merge4

adding a
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
warning: detected divergent renames of a to:
 a2
 a1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding a
b
 b: searching for copy revision for a
 b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db
committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 6 changesets, 4 total revisions
# HG changeset patch
# User test
# Date 0 0
# Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b
# Parent  7fc86ba705e717a721dbc361bf8c9bc05a18ca2f
5

diff --git a/b b/b
new file mode 100644