mercurial-crew-with-dirclash: tests/test-merge4@fc6106267198

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

tests/test-merge4

author	Thomas Arendsen Hein <thomas@intevation.de>
	Sat, 11 Aug 2007 12:36:04 +0200
changeset 5143	fc6106267198
parent 2283	e506c14382fd
permissions	-rwxr-xr-x

Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.


#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"

mercurial-crew-with-dirclash

RSS Atom