Mercurial > hg > gitweb
view tests/test-diff-newlines @ 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 | b914f0557832 |
children |
line wrap: on
line source
#!/bin/sh hg init python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a hg ci -Ama -d '1 0' echo clean diff >> a hg ci -mb -d '2 0' hg diff -r0 -r1