Merge branch 'maint'
[gitweb.git] / lib / merge.tcl
2007-05-08 Merge branch 'maint'
2007-05-08 git-gui: Use vi-like keys in merge dialog gitgui-0.7.0-rc1
2007-05-08 git-gui: Include commit id/subject in merge choices
2007-05-08 git-gui: Show all possible branches for merge
2007-05-08 git-gui: Move merge support into a namespace
2007-05-08 git-gui: Move console procs into their own namespace
2007-05-08 git-gui: Refactor into multiple files to save my sanity