Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-cat @ 1798:d610fe0e6893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 63799b01985c
children 7544700fd931
line wrap: on
line source

#!/bin/sh
#
mkdir t
cd t
hg init
echo 0 > a
echo 0 > b
hg ci -A -m m -d "0 0"
hg rm a
hg cat a
sleep 1 # make sure mtime is changed
echo 1 > b
hg ci -m m -d "0 0"
echo 2 > b
hg cat -r 0 a
hg cat -r 0 b
hg cat -r 1 a
hg cat -r 1 b