##// 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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4387:93a4e72b default
r10060:f780b109 default
Show More
test-conflict
15 lines | 244 B | text/plain | TextLexer
/ tests / test-conflict
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status