rtime.felk.cvut.cz Git - sojka/git-gui.git/history - lib/mergetool.tcl

]> rtime.felk.cvut.cz Git - sojka/git-gui.git/history - lib/mergetool.tcl

projects / sojka / git-gui.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[sojka/git-gui.git] / lib / mergetool.tcl

2011-02-27	Sebastian Schuberth	mergetool--lib: Sort tools alphabetically for easier...	blob \| commitdiff \| raw
2009-04-08	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-04-08	Ferry Huberts	git-gui: Ensure consistent usage of mergetool.keepBackup	blob \| commitdiff \| raw \| diff to current
2009-03-20	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-03-20	Jens Lehmann	git-gui: Fix merge conflict display error when filename...	blob \| commitdiff \| raw \| diff to current
2008-09-30	Alexander Gavrilov	git-gui: Make Ctrl-T safe to use for conflicting files.	blob \| commitdiff \| raw \| diff to current
2008-09-30	Johannes Sixt	git-gui: Do not automatically stage file after merge...	blob \| commitdiff \| raw \| diff to current
2008-09-26	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-24	Alexander Gavrilov	git-gui: Reenable staging unmerged files by clicking...	blob \| commitdiff \| raw \| diff to current
2008-09-12	Christian Stimming	git-gui: I18n fix sentence parts into full sentences...	blob \| commitdiff \| raw \| diff to current
2008-09-12	Alexander Gavrilov	git-gui: Restore ability to Stage Working Copy for...	blob \| commitdiff \| raw \| diff to current
2008-09-05	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-05	Alexander Gavrilov	git-gui: Reimplement and enhance auto-selection of...	blob \| commitdiff \| raw \| diff to current
2008-09-05	Alexander Gavrilov	git-gui: Support more merge tools.	blob \| commitdiff \| raw \| diff to current
2008-09-05	Alexander Gavrilov	git-gui: Support calling merge tools.	blob \| commitdiff \| raw \| diff to current
2008-09-05	Alexander Gavrilov	git-gui: Support resolving conflicts via the diff conte...	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.