Mercurial > hg
view tests/test-conflict @ 1995:2da2d46862fb
Spelling fix: "commited" -> "committed"
author | mcmillen@cs.cmu.edu |
---|---|
date | Fri, 24 Mar 2006 14:53:23 +0100 |
parents | 7544700fd931 |
children | e506c14382fd |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id egrep -v ">>>|<<<" a hg status