view tests/test-conflict @ 673:8e518e11f6cf

Change MANIFEST.in to recursive-include the contrib/ folder. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID e5dc09266c217bc50b91d710a045c679411e4727 # Parent c55df1c38618035c8e94e7af025e2b7f38f6d743 Change MANIFEST.in to recursive-include the contrib/ folder. Now sdist picks up git-viz again.
author Andrew Thompson <andrewkt@aktzero.com>
date Sun, 10 Jul 2005 16:14:41 -0800
parents eb46971fc57f
children 7e4843b7efd2
line wrap: on
line source

#!/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