Mercurial > hg

view tests/test-conflict @ 496:6ce95a04999d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] simplify init -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] simplify init From: Bryan O'Sullivan <bos@serpentine.com> Remove source directory option from "hg init". manifest hash: 2ace7b16c962fb434340b937fbcd494f3098a85f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwQG/ywK+sNU5EO8RArbCAJ9DG45GepMI0Z9KWXqV8gmEbV1WfwCgotih LGAkD8iTfOLn7HIPVqt9FWY= =65uW -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 27 Jun 2005 23:52:31 -0800
parents ee4c80d294e5
children 3d4d5f2aba9a 4fc63e22b1fe
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
grep -Ev ">>>|<<<" a
hg status