summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
Commit message (Expand)AuthorAgeFilesLines
* 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