projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-gui: set version 0.21
[git] / lib / mergetool.tcl
2013-02-22  Pat Thoytsgit-gui: fix the mergetool launcher for the Beyond... blob | commitdiff | raw
2011-03-25  Pat ThoytsMerge branch 'ss/git-gui-mergetool' gitgui-0.14.0 blob | commitdiff | raw | diff to current
2011-02-27  Sebastian Schuberthmergetool--lib: Add Beyond Compare 3 as a tool blob | commitdiff | raw | diff to current
2011-02-27  Sebastian Schuberthmergetool--lib: Sort tools alphabetically for easier... blob | commitdiff | raw | diff to current
2009-04-08  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-04-08  Ferry Hubertsgit-gui: Ensure consistent usage of mergetool.keepBackup blob | commitdiff | raw | diff to current
2009-03-20  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2009-03-20  Jens Lehmanngit-gui: Fix merge conflict display error when filename... blob | commitdiff | raw | diff to current
2008-09-30  Alexander Gavrilovgit-gui: Make Ctrl-T safe to use for conflicting files. blob | commitdiff | raw | diff to current
2008-09-30  Johannes Sixtgit-gui: Do not automatically stage file after merge... blob | commitdiff | raw | diff to current
2008-09-26  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-09-24  Alexander Gavrilovgit-gui: Reenable staging unmerged files by clicking... blob | commitdiff | raw | diff to current
2008-09-12  Christian Stimminggit-gui: I18n fix sentence parts into full sentences... blob | commitdiff | raw | diff to current
2008-09-12  Alexander Gavrilovgit-gui: Restore ability to Stage Working Copy for... blob | commitdiff | raw | diff to current
2008-09-05  Shawn O. PearceMerge branch 'maint' blob | commitdiff | raw | diff to current
2008-09-05  Alexander Gavrilovgit-gui: Reimplement and enhance auto-selection of... blob | commitdiff | raw | diff to current
2008-09-05  Alexander Gavrilovgit-gui: Support more merge tools. blob | commitdiff | raw | diff to current
2008-09-05  Alexander Gavrilovgit-gui: Support calling merge tools. blob | commitdiff | raw | diff to current
2008-09-05  Alexander Gavrilovgit-gui: Support resolving conflicts via the diff conte... blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.