|
Size: 1307
Comment:
|
Size: 514
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| This is a subjective evaluation of KDiff3. Please add your opinion. == Description == [http://kdiff3.sourceforge.net/ KDiff3] is a KDE / QT merge tool. For 3-way merge it can show both the 2 parent versions and their common ancestor side-by-side in top panes and the editable merge result in the bottom pane. It is GPL and runs on "all" platforms. It is included in the TortoiseHg installer for Windows. KDiff3 as [http://sourceforge.net/projects/kdiff3 project] seems stale but stable. == Usage notes and tips == * The option {{{--auto}}} will try to auto-merge silently, similar to what Mercurial premerge does. Disabling Mercurial premerge will not disable kdiff3 auto merge. * One change has focus at a time; the currently selected change is yellow-ish - move with up/down triangle buttons or use ctrl+up/down. * The 3 input files are labelled A, B and C, and appearance of the 3 sides of a change in the merge result can be toggled with buttons or ctrl+1/2/3. * The margin of the merge result shows where the lines come from (or m for manual changes). * Usage example in [http://hgbook.red-bean.com/hgbookch3.html hgbook]. == Issues == * Doesn't look fancy * QT and KDE dependencies == Conclusion == KDiff3 is the "best" merge tool; stable and feature rich. |
Usa is what you has the potential to call me but a can call me an item you like.<<BR>> <<BR>> I am really loving of badge collecting plus I would never impart it up. I used to generally be unemployed but now Which i am a meter website reader but I've always wanted to see my own business. New Jersey is where all of us been living for a long but I will obtain to move in the perfect year or two.<<BR>> <<BR>> I am running and as well , maintaining a blog here: http://www.winipalo.com/user/profile/shannonp4/ |
Usa is what you has the potential to call me but a can call me an item you like.
I am really loving of badge collecting plus I would never impart it up. I used to generally be unemployed but now Which i am a meter website reader but I've always wanted to see my own business. New Jersey is where all of us been living for a long but I will obtain to move in the perfect year or two.
I am running and as well , maintaining a blog here: http://www.winipalo.com/user/profile/shannonp4/