Mercurial > hg
view tests/test-diff-newlines.out @ 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 | 3d1f9dcecdea |
children |
line wrap: on
line source
adding a diff -r 107ba6f817b5 -r 310ce7989cdc a --- a/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:02 1970 +0000 @@ -1,2 +1,3 @@ confuse str.splitlines embedded newline +clean diff