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

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

test-fetch: fix non-portable sed regex....
test-fetch: fix non-portable sed regex. (s/...\+/.../ appears to be a GNU-ism: this test broke on OS X and NetBSD. Changing \+ to * fixes it, although that is a slightly less strict regex.)
Steve Borho - - Load All Authors

File last commit:

r8545:3682a19b default
r9121:a85a3d39 default
Show More
test-merge-force.out
11 lines | 332 B | text/plain | TextLexer
/ tests / test-merge-force.out
History | Annotation | Raw |Copy content |Copy permalink
created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes (use 'hg status' to list changes)
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