##// END OF EJS Templates
Merge with i18n
Merge with i18n

File last commit:

r6935:03916abd default
r10489:3232dba5 merge stable
Show More
test-issue1175.out
25 lines | 696 B | text/plain | TextLexer
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:755e75751bf67eb4378bca61987df035d90a7a06
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 755e75751bf67eb4378bca61987df035d90a7a06
# Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d
5
diff --git a/b b/b
new file mode 100644