summaryrefslogtreecommitdiff
path: root/lib/merge.tcl
AgeCommit message (Expand)AuthorFilesLines
2007-07-19git-gui: Completely remove support for creating octopus mergesLibravatar Shawn O. Pearce1-68/+17
2007-07-18git-gui: Convert merge dialog to use class systemLibravatar Shawn O. Pearce1-41/+65
2007-07-09git-gui: Always use absolute path to all git executablesLibravatar Shawn O. Pearce1-8/+10
2007-07-08git-gui: Refactor our ui_status_value update techniqueLibravatar Shawn O. Pearce1-7/+7
2007-07-04git-gui: Unlock the index when cancelling merge dialogLibravatar Shawn O. Pearce1-1/+3
2007-06-11git-gui: Save geometry before the window layout is damagedLibravatar Shawn O. Pearce1-2/+3
2007-05-08git-gui: Convert browser, console to "class" formatLibravatar Shawn O. Pearce1-1/+2
2007-05-08git-gui: Allow shift-{k,j} to select a range of branches to mergeLibravatar Shawn O. Pearce1-0/+2
2007-05-07git-gui: Use vi-like keys in merge dialogLibravatar Shawn O. Pearce1-6/+14
2007-05-07git-gui: Include commit id/subject in merge choicesLibravatar Shawn O. Pearce1-45/+54
2007-05-07git-gui: Show all possible branches for mergeLibravatar Shawn O. Pearce1-7/+13
2007-05-07git-gui: Move merge support into a namespaceLibravatar Shawn O. Pearce1-13/+18
2007-05-07git-gui: Move console procs into their own namespaceLibravatar Shawn O. Pearce1-3/+3
2007-05-07git-gui: Refactor into multiple files to save my sanityLibravatar Shawn O. Pearce1-0/+281