Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 675:49de76abc4da
hg clone stored path fix
# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
hg clone stored path fix
The abspath() has been lost in changeset 634 (da5378d39269).
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 10 Jul 2005 16:15:20 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
346 | 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 | |
591 | 14 hg up -m 1 |
346 | 15 hg id |
392 | 16 grep -Ev ">>>|<<<" a |
346 | 17 hg status |