Mercurial > hg > gitweb
view tests/test-diff-hashes @ 3869:ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 11 Dec 2006 18:09:52 +0100 |
parents | 2065789f6a3e |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a echo bar > foo hg add foo hg ci -m 'add foo' -d '1000000 0' echo foobar > foo hg ci -m 'change foo' -d '1000001 0' echo 'quiet:' hg --quiet diff -r 0 -r 1 echo echo 'normal:' hg diff -r 0 -r 1 echo echo 'verbose:' hg --verbose diff -r 0 -r 1 echo echo 'debug:' hg --debug diff -r 0 -r 1 echo