equal
deleted
inserted
replaced
57 resolving manifests |
57 resolving manifests |
58 overwrite: False, partial: False |
58 overwrite: False, partial: False |
59 ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 |
59 ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 |
60 a: update permissions -> e |
60 a: update permissions -> e |
61 updating: a 1/1 files (100.00%) |
61 updating: a 1/1 files (100.00%) |
62 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 (branch merge, don't forget to commit) |
63 (branch merge, don't forget to commit) |
64 |
64 |
65 Simulate a Windows commit: |
65 Simulate a Windows commit: |
66 |
66 |
67 $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge' |
67 $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge' |