Mercurial > hg
view tests/test-conflict @ 667:31a9aa890016
A number of minor fixes to problems that pychecker found.
# HG changeset patch
# User mark.williamson@cl.cam.ac.uk
# Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
A number of minor fixes to problems that pychecker found.
author | mark.williamson@cl.cam.ac.uk |
---|---|
date | Sun, 10 Jul 2005 16:01:11 -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