tests/test-merge-types.out
author Johannes Stezenbach <js@sig21.net>
Sat, 07 Jun 2008 09:49:34 +0200
changeset 6652 ffcf8e82f647
parent 6336 4b0c9c674707
child 7320 8dca507e56ce
permissions -rw-r--r--
help: enable listing of a subset of the command list Instead of giving the "command %s is ambiguous" error message with a bare list of possible command, display help list for all commands starting with the given string.

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
 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)