<-back

Edit -> Auto-Diff draft

---

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 marker (changed), blue.

You can click then on those margin markers to show what has actually been added, deleted or changed.

---

Diff-Box

08:31

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.

Note two Tabs -> 8 Chr per Tab = 16 charters indent Ouch!

Previous Diff

Move to Previous Diff.

Next Diff

Move to Next Diff.

Revert

Revert current Diff.

---

Miscellaneous

Q, I do not see any content in the Diff-Box for add, only changed and deleted.

A, aha...

that's the trick
you get old text in your diff box
so you'll revert it
if you add new lines, then nothing
get it?

---

Limitations

• SUBVERSION => 'SVN',
• GIT => 'Git',

---

ToDo

• MERCURIAL => 'Mercurial',
• BAZAAR => 'Bazaar',
• CVS => 'CVS',

__END__

<-back