view tests/test-merge3 @ 1246:ae96c85fb0af

mercurial.el: implement hg-pull, and stub in hg-update.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 09 Sep 2005 22:07:10 -0700
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"