mergetool--lib: Sort tools alphabetically for easier lookup
[git/git.git] / lib / mergetool.tcl
2011-02-27 Sebastian Schuberthmergetool--lib: Sort tools alphabetically for easier...
2009-04-08 Shawn O. PearceMerge branch 'maint'
2009-04-08 Ferry Hubertsgit-gui: Ensure consistent usage of mergetool.keepBackup
2009-03-20 Shawn O. PearceMerge branch 'maint'
2009-03-20 Jens Lehmanngit-gui: Fix merge conflict display error when filename...
2008-09-30 Alexander Gavrilovgit-gui: Make Ctrl-T safe to use for conflicting files.
2008-09-30 Johannes Sixtgit-gui: Do not automatically stage file after merge...
2008-09-26 Shawn O. PearceMerge branch 'maint'
2008-09-24 Alexander Gavrilovgit-gui: Reenable staging unmerged files by clicking...
2008-09-12 Christian Stimminggit-gui: I18n fix sentence parts into full sentences...
2008-09-12 Alexander Gavrilovgit-gui: Restore ability to Stage Working Copy for...
2008-09-05 Shawn O. PearceMerge branch 'maint'
2008-09-05 Alexander Gavrilovgit-gui: Reimplement and enhance auto-selection of...
2008-09-05 Alexander Gavrilovgit-gui: Support more merge tools.
2008-09-05 Alexander Gavrilovgit-gui: Support calling merge tools.
2008-09-05 Alexander Gavrilovgit-gui: Support resolving conflicts via the diff conte...