index
:
git
gitk-resize-error
main
Fork of git SCM with my patches.
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lib
/
mergetool.tcl
Age
Commit message (
Expand
)
Author
2011-02-27
mergetool--lib: Add Beyond Compare 3 as a tool
Sebastian Schuberth
2011-02-27
mergetool--lib: Sort tools alphabetically for easier lookup
Sebastian Schuberth
2009-04-08
git-gui: Ensure consistent usage of mergetool.keepBackup
Ferry Huberts
2009-03-20
git-gui: Fix merge conflict display error when filename contains spaces
Jens Lehmann
2008-09-30
git-gui: Make Ctrl-T safe to use for conflicting files.
Alexander Gavrilov
2008-09-30
git-gui: Do not automatically stage file after merge tool finishes
Johannes Sixt
2008-09-24
git-gui: Reenable staging unmerged files by clicking the icon.
Alexander Gavrilov
2008-09-12
git-gui: I18n fix sentence parts into full sentences for translation again.
Christian Stimming
2008-09-12
git-gui: Restore ability to Stage Working Copy for conflicts.
Alexander Gavrilov
2008-09-04
git-gui: Reimplement and enhance auto-selection of diffs.
Alexander Gavrilov
2008-09-04
git-gui: Support more merge tools.
Alexander Gavrilov
2008-09-04
git-gui: Support calling merge tools.
Alexander Gavrilov
2008-09-04
git-gui: Support resolving conflicts via the diff context menu.
Alexander Gavrilov
