Mercurial > hg-stable
changeset 12318:d643ae555a4d
Merge with stable
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Fri, 17 Sep 2010 12:45:13 -0500 |
| parents | 4134686b83e1 (current diff) ed639917c825 (diff) |
| children | 11db6fa2961e b701610f6c56 d9b82da3db29 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-eol-update.out Thu Sep 16 17:51:32 2010 -0500 +++ b/tests/test-eol-update.out Fri Sep 17 12:45:13 2010 -0500 @@ -25,8 +25,8 @@ merging a.txt 1 files updated, 1 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt -first\r -third\r +first +third % hg diff diff --git a/a.txt b/a.txt --- a/a.txt @@ -57,8 +57,8 @@ merging a.txt 1 files updated, 1 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt -first\r -third\r +first +third % hg diff diff --git a/a.txt b/a.txt --- a/a.txt