summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
AgeCommit message (Expand)AuthorFilesLines
2020-05-21Merge https://github.com/prati0100/git-guiLibravatar Junio C Hamano1-1/+1
2013-06-16Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiLibravatar Junio C Hamano1-2/+2
2011-03-26Merge git-gui 0.14.0Libravatar Junio C Hamano1-47/+54
2009-05-01Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano1-2/+2
2008-11-01Merge git://repo.or.cz/git-guiLibravatar Junio C Hamano1-12/+5
2008-09-25Merge git://repo.or.cz/git-guiLibravatar Shawn O. Pearce1-6/+33
2008-09-06Merge updated git-gui and gitk that call each otherLibravatar Junio C Hamano1-0/+373