]> asedeno.scripts.mit.edu Git - git.git/history - lib/mergetool.tcl
git-gui: Show special diffs for complex conflict cases.
[git.git] / lib / mergetool.tcl
2008-09-05 Alexander Gavrilovgit-gui: Reimplement and enhance auto-selection of diffs.
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...