summaryrefslogtreecommitdiff
path: root/lib/mergetool.tcl
AgeCommit message (Expand)AuthorFilesLines
2020-04-22Subject: git-gui: fix syntax error because of missing semicolonLibravatar Ansgar Röber1-1/+1
2013-02-22git-gui: fix the mergetool launcher for the Beyond Compare tool.Libravatar Pat Thoyts1-2/+2
2011-02-27mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-0/+7
2011-02-27mergetool--lib: Sort tools alphabetically for easier lookupLibravatar Sebastian Schuberth1-47/+47
2009-04-08git-gui: Ensure consistent usage of mergetool.keepBackupLibravatar Ferry Huberts1-1/+1
2009-03-20git-gui: Fix merge conflict display error when filename contains spacesLibravatar Jens Lehmann1-1/+1
2008-09-30git-gui: Make Ctrl-T safe to use for conflicting files.Libravatar Alexander Gavrilov1-3/+4
2008-09-30git-gui: Do not automatically stage file after merge tool finishesLibravatar Johannes Sixt1-9/+1
2008-09-24git-gui: Reenable staging unmerged files by clicking the icon.Libravatar Alexander Gavrilov1-6/+27
2008-09-12git-gui: I18n fix sentence parts into full sentences for translation again.Libravatar Christian Stimming1-6/+6
2008-09-12git-gui: Restore ability to Stage Working Copy for conflicts.Libravatar Alexander Gavrilov1-0/+6
2008-09-04git-gui: Reimplement and enhance auto-selection of diffs.Libravatar Alexander Gavrilov1-6/+2
2008-09-04git-gui: Support more merge tools.Libravatar Alexander Gavrilov1-0/+27
2008-09-04git-gui: Support calling merge tools.Libravatar Alexander Gavrilov1-0/+252
2008-09-04git-gui: Support resolving conflicts via the diff context menu.Libravatar Alexander Gavrilov1-0/+98