aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-01 17:50:20 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-01 17:50:20 -0700
commit82d861f9d65080f5c66a5f3c956627af6ded78d9 (patch)
tree5383e83f71ea7e1b734b1d897624b2f2a2630c9a /git-gui/lib/mergetool.tcl
parent142c945e6e6d944aff4187c55c3655d9608ca376 (diff)
parent52d269da7ec66338e733aaf839ce5b8ad6709337 (diff)
downloadgit-82d861f9d65080f5c66a5f3c956627af6ded78d9.tar.gz
git-82d861f9d65080f5c66a5f3c956627af6ded78d9.tar.xz
Merge branch 'sb/sparse-more'
* sb/sparse-more: Makefile: Cover more files with make check
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions