mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
c6129ace2e
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----
18 lines
293 B
Bash
Executable File
18 lines
293 B
Bash
Executable File
#!/bin/sh
|
|
|
|
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 up -m 1
|
|
hg id
|
|
grep -Ev ">>>|<<<" a
|
|
hg status
|