summaryrefslogtreecommitdiffstats
path: root/test/fixtures/diffs
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-03-11 20:23:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-03-11 20:23:29 +0000
commit21c79827ff73916aa7fa8a6cce0645fc34a7c7fd (patch)
tree0c85f6328ee655a5fe161e7037963656b1af1107 /test/fixtures/diffs
parent099ba68836b9ff4544df3c46b6f5cb8a6081a185 (diff)
downloadredmine-21c79827ff73916aa7fa8a6cce0645fc34a7c7fd.tar.gz
redmine-21c79827ff73916aa7fa8a6cce0645fc34a7c7fd.zip
Highlight changes inside diff lines (#7139).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5094 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/fixtures/diffs')
-rw-r--r--test/fixtures/diffs/partials.diff46
1 files changed, 46 insertions, 0 deletions
diff --git a/test/fixtures/diffs/partials.diff b/test/fixtures/diffs/partials.diff
new file mode 100644
index 000000000..f745776c4
--- /dev/null
+++ b/test/fixtures/diffs/partials.diff
@@ -0,0 +1,46 @@
+--- partials.txt Wed Jan 19 12:06:17 2011
++++ partials.1.txt Wed Jan 19 12:06:10 2011
+@@ -1,31 +1,31 @@
+-Lorem ipsum dolor sit amet, consectetur adipiscing elit
++Lorem ipsum dolor sit amet, consectetur adipiscing xx
+ Praesent et sagittis dui. Vivamus ac diam diam
+-Ut sed auctor justo
++xxx auctor justo
+ Suspendisse venenatis sollicitudin magna quis suscipit
+-Sed blandit gravida odio ac ultrices
++Sed blandit gxxxxa odio ac ultrices
+ Morbi rhoncus est ut est aliquam tempus
+-Morbi id nisi vel felis tincidunt tempus
++Morbi id nisi vel felis xx tempus
+ Mauris auctor sagittis ante eu luctus
+-Fusce commodo felis sed ligula congue molestie
++Fusce commodo felis sed ligula congue
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit
+-Praesent et sagittis dui. Vivamus ac diam diam
++et sagittis dui. Vivamus ac diam diam
+ Ut sed auctor justo
+ Suspendisse venenatis sollicitudin magna quis suscipit
+ Sed blandit gravida odio ac ultrices
+
+-Lorem ipsum dolor sit amet, consectetur adipiscing elit
+-Praesent et sagittis dui. Vivamus ac diam diam
++Lorem ipsum dolor sit amet, xxxx adipiscing elit
+ Ut sed auctor justo
+ Suspendisse venenatis sollicitudin magna quis suscipit
+ Sed blandit gravida odio ac ultrices
+-Morbi rhoncus est ut est aliquam tempus
++Morbi rhoncus est ut est xxxx tempus
++New line
+ Morbi id nisi vel felis tincidunt tempus
+ Mauris auctor sagittis ante eu luctus
+ Fusce commodo felis sed ligula congue molestie
+
+-Lorem ipsum dolor sit amet, consectetur adipiscing elit
+-Praesent et sagittis dui. Vivamus ac diam diam
+-Ut sed auctor justo
++Lorem ipsum dolor sit amet, xxxxtetur adipiscing elit
++Praesent et xxxxx. Vivamus ac diam diam
++Ut sed auctor
+ Suspendisse venenatis sollicitudin magna quis suscipit
+ Sed blandit gravida odio ac ultrices
+ Morbi rhoncus est ut est aliquam tempus