aboutsummaryrefslogtreecommitdiff
path: root/lib/mergetool.tcl
Commit message (Expand)AuthorAge
* git-gui: Ensure consistent usage of mergetool.keepBackupFerry Huberts2009-04-08
* git-gui: Fix merge conflict display error when filename contains spacesJens Lehmann2009-03-20
* git-gui: Make Ctrl-T safe to use for conflicting files.Alexander Gavrilov2008-09-30
* git-gui: Do not automatically stage file after merge tool finishesJohannes Sixt2008-09-30
* git-gui: Reenable staging unmerged files by clicking the icon.Alexander Gavrilov2008-09-24
* git-gui: I18n fix sentence parts into full sentences for translation again.Christian Stimming2008-09-12
* git-gui: Restore ability to Stage Working Copy for conflicts.Alexander Gavrilov2008-09-12
* git-gui: Reimplement and enhance auto-selection of diffs.Alexander Gavrilov2008-09-04
* git-gui: Support more merge tools.Alexander Gavrilov2008-09-04
* git-gui: Support calling merge tools.Alexander Gavrilov2008-09-04
* git-gui: Support resolving conflicts via the diff context menu.Alexander Gavrilov2008-09-04