Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-addremove @ 1664:4338e33c973b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents eef8ff46567a
children 7544700fd931
line wrap: on
line source

#!/bin/sh

hg init rep
cd rep
mkdir dir
touch foo dir/bar
hg -v addremove
hg -v commit -m "add 1" -d "0 0"
cd dir/
touch ../foo_2 bar_2
hg -v addremove
hg -v commit -m "add 2" -d "0 0"