Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 357:1cb3d9d5119e
[PATCH] Update hgit to the new commands.dodiff parameters
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Update hgit to the new commands.dodiff parameters
From: Chris Mason <mason@suse.com>
Update hgit to the new commands.dodiff parameters
manifest hash: aa8d98036fae49ab1c1c0e65d86ab0e1bee0fa71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsG35ywK+sNU5EO8RAhnoAJwMgK1QA8DkdbU2R19LoLRK1fmCaQCeN1dh
4fHRT4hf+Qi5fND4CpOyqBU=
=63xo
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 10:05:45 -0800 |
parents | f69a5d2d4fe1 |
children | ee4c80d294e5 |
line wrap: on
line source
#!/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