Mercurial > hg
view tests/test-issue612 @ 7769:8c06d4bf2c23
test-merge-tools: Don't use tac
"tac" was a bad tool - is not available on all platforms.
The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 16:11:48 +0100 |
parents | 9797124581c9 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir src echo a > src/a.c hg ci -Ama -d "10000000 0" hg mv src source hg ci -Ammove -d "1000000 0" hg co -C 0 echo new > src/a.c echo compiled > src/a.o hg ci -mupdate -d "1000000 0" hg st hg merge hg st