aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
AgeCommit message (Expand)Author
2025-08-04Merge branch 'master' of https://github.com/j6t/git-guiJunio C Hamano
2025-05-28Sync with 2.47.3Taylor Blau
2025-05-23Merge branch 'js/fix-open-exec'Johannes Sixt
2024-11-11Merge https://github.com/j6t/git-guiJunio C Hamano
2020-05-21Merge https://github.com/prati0100/git-guiJunio C Hamano
2013-06-16Merge 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-01Merge git://repo.or.cz/git-guiJunio C Hamano
2008-11-01Merge git://repo.or.cz/git-guiJunio C Hamano
2008-09-25Merge git://repo.or.cz/git-guiShawn O. Pearce
2008-09-06Merge updated git-gui and gitk that call each otherJunio C Hamano
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 10:05:50 +0000