mercurial-crew-with-dirclash: tests/test-merge3@8ba1c31f6864

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-merge3

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Fri, 14 Jul 2006 23:19:15 -0700
changeset 2614	8ba1c31f6864
parent 1933	7544700fd931
permissions	-rwxr-xr-x

backout: allow backout of merge changeset with --parent option. --parent allows to choose which parent of merge to revert to.


#!/bin/sh

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

mercurial-crew-with-dirclash

RSS Atom