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

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

hgweb: pull cgitb into CGI script example, where it can easily be disabled...
hgweb: pull cgitb into CGI script example, where it can easily be disabled -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: pull cgitb into CGI script example, where it can easily be disabled This also eliminates cgitb dumps in the logging output of hg serve manifest hash: a0aa07a706c2c388c0b49505e2960197f716920c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9DywK+sNU5EO8RAieFAJwOjdfkz7pILNVUTvpMkRa6/OIhIQCgo2TP I2E4hxQ0N7mTtl45pXEFLsk= =tG0v -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r346:f69a5d2d default
r391:5f65a108 default
Show More
test-conflict
17 lines | 315 B | text/plain | TextLexer
/ tests / test-conflict
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/bash
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
cat a | grep -v ">>>" | grep -v "<<<"
hg status