Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diff-newlines.out @ 4386:f9cd48bd8625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix minor mismerge. The caching of umask ended up being duplicated.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents b914f0557832
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
 confuse str.splitlines
 embedded
newline
+clean diff