summaryrefslogtreecommitdiffstats
path: root/lib/merge.tcl (follow)
AgeCommit message (Expand)AuthorFilesLines
2007-05-08git-gui: Convert browser, console to "class" formatShawn O. Pearce1-1/+2
2007-05-08git-gui: Allow shift-{k,j} to select a range of branches to mergeShawn O. Pearce1-0/+2
2007-05-07git-gui: Use vi-like keys in merge dialoggitgui-0.7.0-rc1Shawn O. Pearce1-6/+14
2007-05-07git-gui: Include commit id/subject in merge choicesShawn O. Pearce1-45/+54
2007-05-07git-gui: Show all possible branches for mergeShawn O. Pearce1-7/+13
2007-05-07git-gui: Move merge support into a namespaceShawn O. Pearce1-13/+18
2007-05-07git-gui: Move console procs into their own namespaceShawn O. Pearce1-3/+3
2007-05-07git-gui: Refactor into multiple files to save my sanityShawn O. Pearce1-0/+281