summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-28 11:12:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-28 11:12:47 -0800
commit7025616048e2cdf61b7f5c6e4fba8045020fb537 (patch)
treef56fa3fdf48e1e646552b731b05a4063b5f1446c /mergetools/tkdiff
parentMerge branch 'jn/maint-trim-vim-contrib' into maint (diff)
parentgit-completion.bash: silence "not a valid object" errors (diff)
downloadtgif-7025616048e2cdf61b7f5c6e4fba8045020fb537.tar.xz
Merge branch 'ds/completion-silence-in-tree-path-probe' into maint
* ds/completion-silence-in-tree-path-probe: git-completion.bash: silence "not a valid object" errors
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions