Mercurial > hg
view tests/test-diff-newlines @ 11452:eac141407b85 stable
merge: document how to 'undo' a merge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 27 Jun 2010 17:41:43 -0500 |
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