Mercurial > hg
view tests/test-merge-types.out @ 5757:c5793dada959
Clarify some messages during commit:
- use "branch 'foo'" to distinguish from "branch merge".
- commit messags can be empty (to abort commits)
- Added value for editor message: Tell about HG: lines like CVS does.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Dec 2007 17:10:25 +0100 |
parents | 026eb80060d8 |
children | 4b0c9c674707 |
line wrap: on
line source
adding a 0 files updated, 0 files merged, 0 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c searching for copies back to rev 1 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 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)