Mercurial > hg > gitweb

view tests/test-diff-newlines.out @ 3869:ad6f34c83c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 11 Dec 2006 18:09:52 +0100
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