Mercurial > hg
view tests/test-diff-newlines @ 2897:dd032b0f02ac
merge: move forgets to the apply stage
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Aug 2006 18:30:21 -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