##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

profiling: dropping hotshot profiling. --profile as a unique profiling option...
profiling: dropping hotshot profiling. --profile as a unique profiling option hotshot was an experimental module, which is broken for Python < 2.5 And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile (formerly lsprof) should be used instead.
Peter Arrenbrecht - - Load All Authors

File last commit:

r7320:8dca507e default
r8021:1c2cf2e5 default
Show More
test-merge-types.out
27 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-merge-types.out
History | Annotation | Raw |Copy content |Copy permalink
adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
searching for copies back to rev 1
conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
a: update permissions -> e
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
searching for copies back to rev 1
conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
a: remote is newer -> g
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)