Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 5059:8d9bdcbb2b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: avoid double deletion mentioned in issue636
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Aug 2007 12:29:10 -0500
parents 7544700fd931
children
line wrap: on
line source

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