Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diff-newlines.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Nov 2006 21:47:55 -0600
changeset 3618 3109f012c305
parent 2248 b914f0557832
child 5863 3d1f9dcecdea
permissions -rw-r--r--
Clarify untracked file merge message
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
Mercurial