summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-16 15:24:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-16 15:24:20 (GMT)
commit0987145dd3d11373270c1e0cfbd449f2c6c834c9 (patch)
treed088652b6cce0bc844da014edf615a26847ecad3 /git-difftool.perl
parentc3117b21666f2a68aebd5fce0bcdc4ab705c299a (diff)
parent79e0fe634865462551cf3fcad25c9a595652e925 (diff)
downloadgit-0987145dd3d11373270c1e0cfbd449f2c6c834c9.zip
git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.gz
git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.bz2
Merge branch 'th/mergetools-deltawalker'
* th/mergetools-deltawalker: Documentation/difftool: add deltawalker to list of valid diff tools
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions