Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-diff-newlines.out @ 4089:0ff50cc7acb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: open files in binary mode Problem noticed by Darrell Gallion.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 15 Feb 2007 08:14:03 -0200
parents b914f0557832
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2248
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
1 adding a
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
2 diff -r 107ba6f817b5 -r 310ce7989cdc a
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
3 --- a/a Thu Jan 01 00:00:01 1970 +0000
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
4 +++ b/a Thu Jan 01 00:00:02 1970 +0000
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
5 @@ -1,2 +1,3 @@ confuse str.splitlines
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6 confuse str.splitlines
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7 embedded newline
b914f0557832 fix diffs containing embedded "\r".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8 +clean diff