summaryrefslogtreecommitdiff
path: root/lib/merge.tcl
AgeCommit message (Expand)Author
2007-07-19git-gui: Completely remove support for creating octopus mergesShawn O. Pearce
2007-07-18git-gui: Convert merge dialog to use class systemShawn O. Pearce
2007-07-09git-gui: Always use absolute path to all git executablesShawn O. Pearce
2007-07-09git-gui: Refactor our ui_status_value update techniqueShawn O. Pearce
2007-07-04git-gui: Unlock the index when cancelling merge dialogShawn O. Pearce
2007-06-12git-gui: Save geometry before the window layout is damagedShawn O. Pearce
2007-05-09git-gui: Convert browser, console to "class" formatShawn O. Pearce
2007-05-09git-gui: Allow shift-{k,j} to select a range of branches to mergeShawn O. Pearce
2007-05-08git-gui: Use vi-like keys in merge dialoggitgui-0.7.0-rc1Shawn O. Pearce
2007-05-08git-gui: Include commit id/subject in merge choicesShawn O. Pearce
2007-05-08git-gui: Show all possible branches for mergeShawn O. Pearce
2007-05-08git-gui: Move merge support into a namespaceShawn O. Pearce
2007-05-08git-gui: Move console procs into their own namespaceShawn O. Pearce
2007-05-08git-gui: Refactor into multiple files to save my sanityShawn O. Pearce