summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl