Mercurial > hg
view tests/test-diff-newlines.out @ 2775:b550cd82f92a
Move merge code to its own module
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 03 Aug 2006 15:24:41 -0500 |
| parents | b914f0557832 |
| children | 3d1f9dcecdea |
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 confuse str.splitlines embedded newline +clean diff