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

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

help: enable listing of a subset of the command list...
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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6652:ffcf8e82 default
Show More
test-merge-force.out
11 lines | 298 B | text/plain | TextLexer
/ tests / test-merge-force.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 % local deleted a file, remote removed
Alexis S. L. Carvalho
merge: require --force when there are deleted files
 r6256 abort: outstanding uncommitted changes
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b