Changes between Version 3 and Version 4 of Features/AutoDiff

Timestamp:

09/21/11 19:14:13 (20 months ago)

Author:

bowtie

Comment:

--

Features/AutoDiff

@@ -4 +4 @@
 
 ----
-== Diff-Icons
-[[Image(diff-icon.png)]]
+== Margin Markers
+
+Revision 16300 marks a new milestone in Padre version control system (VCS) support. You can now type and Padre will automatically calculate differences and display them as margin markers.
+* plus (added), dark green.
+* minus (deleted), red.
+* right arrow markers (changed), blue.
+You can click then on those margin markers to show what has actually been added, deleted or changed.
+
+[[Image(padre_diffs.png)]]
 
 ----
+
 == Diff-Box
-[[Image(diff-box.png)]]
+
+Just wanted to say that I recently added a differences popup window to Padre's editor.
+* You can now traverse all differences in your current document (via **Ctrl + comma**).
+* The dialog shows you what was added, deleted or changed at the current difference and enables you to revert the change if needed.
+* Padre can also automatically detect and find differences against your local repository (subversion or git) or the locally saved document.
+
+[[Image(cool_diff_box.png)]]
 
 === Previous Diff
-[[Image(go-up.png)]]
+[[Image(go-up.png)]] Move to Previous Diff.
 
 === Next Diff
-[[Image(go-down.png)]]
+[[Image(go-down.png)]] Move to Next Diff.
 
 === Revert
-[[Image(edit-undo.png)]]
+[[Image(edit-undo.png)]] Revert current Diff.
 ----
 == Miscellaneous