Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge3 @ 2962:882e703eaa94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.py: when comparing mtimes, use only the integer part. Python 2.5 can return timestamps with subsecond resolution.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 20 Aug 2006 01:13:11 -0300
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"