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