view tests/test-merge4 @ 12307:0852da25a31b stable

eol: setup the repo.ui in reposetup()

This fixes problems some have reported using the eol extension
together with TortoiseHg.  It ensures the ui associated with the
repository has the preupdate.eol hook configured.

#!/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"