summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
AgeCommit message (Expand)Author
2007-05-10Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano
2007-05-08Merge branch 'master' of git://repo.or.cz/git-guiShawn O. Pearce