summaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-13 13:59:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-13 13:59:19 -0700
commit6c4c9bdc981180e94b06ba3a29a59288601361a4 (patch)
treed50a8eec64a6785ff37ef49210e539d9c5b1104c /git-gui/lib/mergetool.tcl
parentremove doubled words, e.g., s/to to/to/, and fix related typos (diff)
parentMerge branch 'jc/rev-list-options-fix' into maint (diff)
downloadtgif-6c4c9bdc981180e94b06ba3a29a59288601361a4.tar.xz
Merge branch 'maint'
* maint:
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions