summaryrefslogtreecommitdiffstats
path: root/git-gui/lib/merge.tcl
AgeCommit message (Expand)AuthorLines
2025-07-22Merge branch 'master' of https://github.com/j6t/git-guiJunio C Hamano-16/+7
2025-05-23Merge branch 'js/fix-open-exec'Johannes Sixt-3/+3
2020-03-19Merge https://github.com/prati0100/git-guiJunio C Hamano-1/+1
2020-01-08Merge https://github.com/prati0100/git-guiJunio C Hamano-5/+9
2016-10-20Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guiJunio C Hamano-2/+11
2016-09-26Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...Junio C Hamano-6/+1
2011-03-26Merge git-gui 0.14.0Junio C Hamano-0/+2
2010-02-07Merge git://repo.or.cz/git-guiv1.7.0-rc2Junio C Hamano-7/+7
2008-11-01Merge git://repo.or.cz/git-guiJunio C Hamano-0/+1
2008-07-15Merge git://repo.or.cz/git-guiJunio C Hamano-0/+1
2008-02-13Merge git://repo.or.cz/git-guiJunio C Hamano-3/+2
2007-11-21Merge git://repo.or.cz/git-guiJunio C Hamano-30/+30
2007-08-26Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano-1/+1
2007-07-29Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano-161/+118
2007-07-12Merge commit 'git-gui/master'Junio C Hamano-16/+20
2007-06-12Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano-2/+3
2007-05-10Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano-1/+4
2007-05-07Merge branch 'master' of git://repo.or.cz/git-guiShawn O. Pearce-0/+309
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-27 08:45:49 +0000