5 Commits (2fe5b2ee42897a3acc78e5ddaace3775eb2713ca)

Author SHA1 Message Date
Alexander Gavrilov 2fe5b2ee42 git-gui: Restore ability to Stage Working Copy for conflicts. 17 years ago
Alexander Gavrilov 29853b9010 git-gui: Reimplement and enhance auto-selection of diffs. 17 years ago
Alexander Gavrilov 48c74a58b1 git-gui: Support more merge tools. 17 years ago
Alexander Gavrilov 7e30682ce0 git-gui: Support calling merge tools. 17 years ago
Alexander Gavrilov 042c232535 git-gui: Support resolving conflicts via the diff context menu. 17 years ago