Mercurial > hg > gitweb

comparison tests/test-conflict @ 346:f69a5d2d4fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:27:20 -0800
parents
children ee4c80d294e5
comparison
equal deleted inserted replaced
345:9d8d9207c0b3 346:f69a5d2d4fe1
1 #!/bin/bash
2
3 set -x
4 hg init
5 echo "nothing" > a
6 hg add a
7 hg commit -t ancestor -u test -d "0 0"
8 echo "something" > a
9 hg commit -t branch1 -u test -d "0 0"
10 hg co 0
11 echo "something else" > a
12 hg commit -t branch2 -u test -d "0 0"
13 export HGMERGE=merge
14 hg -d up -m 1
15 hg id
16 cat a | grep -v ">>>" | grep -v "<<<"
17 hg status