summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
AgeCommit message (Expand)Author
2013-06-17Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano
2011-03-26Merge git-gui 0.14.0Junio C Hamano
2009-05-02Merge git://repo.or.cz/git-guiJunio C Hamano
2008-11-02Merge git://repo.or.cz/git-guiJunio C Hamano
2008-09-25Merge git://repo.or.cz/git-guiShawn O. Pearce
2008-09-07Merge updated git-gui and gitk that call each otherJunio C Hamano