summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/prati0100/git-guiJunio C Hamano2020-05-211-1/+1
* Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-161-2/+2
* Merge git-gui 0.14.0Junio C Hamano2011-03-261-47/+54
* Merge git://repo.or.cz/git-guiJunio C Hamano2009-05-011-2/+2
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-11-011-12/+5
* Merge git://repo.or.cz/git-guiShawn O. Pearce2008-09-251-6/+33
* Merge updated git-gui and gitk that call each otherJunio C Hamano2008-09-061-0/+373