Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diff-newlines.out @ 2795:135823f37304

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new extension: fetch -> combine pull and merge/update pull changes from remote repo. if changes add new head: merge with new head, commit result. else: update working dir to new head. this makes useful command like git 'pull' command.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 07 Aug 2006 17:27:38 -0700
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