summaryrefslogtreecommitdiff
path: root/lib/merge.tcl
Commit message (Expand)AuthorAgeFilesLines
* git-gui: Unlock the index when cancelling merge dialogShawn O. Pearce2007-07-041-1/+3
* git-gui: Save geometry before the window layout is damagedShawn O. Pearce2007-06-111-2/+3
* git-gui: Convert browser, console to "class" formatShawn O. Pearce2007-05-081-1/+2
* git-gui: Allow shift-{k,j} to select a range of branches to mergeShawn O. Pearce2007-05-081-0/+2
* git-gui: Use vi-like keys in merge dialoggitgui-0.7.0-rc1Shawn O. Pearce2007-05-071-6/+14
* git-gui: Include commit id/subject in merge choicesShawn O. Pearce2007-05-071-45/+54
* git-gui: Show all possible branches for mergeShawn O. Pearce2007-05-071-7/+13
* git-gui: Move merge support into a namespaceShawn O. Pearce2007-05-071-13/+18
* git-gui: Move console procs into their own namespaceShawn O. Pearce2007-05-071-3/+3
* git-gui: Refactor into multiple files to save my sanityShawn O. Pearce2007-05-071-0/+281