view tests/test-diff-newlines.out @ 5335:88e931f74e8b

convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:00:11 -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