Mercurial > hg
view tests/test-diffdir @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | f80cf8b7bbd9 |
children |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg ci -m "a" -d "1000000 0" echo 123 > b hg add b hg diff --nodates hg diff --nodates -r tip echo foo > a hg diff --nodates hg diff -r "" hg diff -r tip -r "" true