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

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

templatekw: change {file_copies} behaviour, add {file_copies_switch}...
templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.
Martin Geisler - - Load All Authors

File last commit:

r8167:6c82beaa default
r10060:f780b109 default
Show More
test-resolve
27 lines | 417 B | text/plain | TextLexer
/ tests / test-resolve
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# test that a commit clears the merge state.
hg init repo
cd repo
echo foo > file
hg commit -Am 'add file'
echo bar >> file
hg commit -Am 'append bar'
echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'
echo % failing merge
HGMERGE=internal:fail hg merge
echo resolved > file
hg resolve -m file
hg commit -m 'resolved'
echo % resolve -l, should be empty
hg resolve -l