summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-05-17 12:16:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-17 12:16:44 -0700
commit8639f3e49f89525931c86048e81751b05c3923ac (patch)
tree8a27406e1c2ff8f751d99892f95e34de5d3816c0 /mergetools/kdiff3
parentMerge git://ozlabs.org/~paulus/gitk (diff)
parentCodingGuidelines: Documentation/*.txt are the sources (diff)
downloadtgif-8639f3e49f89525931c86048e81751b05c3923ac.tar.xz
Merge branch 'dw/asciidoc-sources-are-dot-txt-files'
* dw/asciidoc-sources-are-dot-txt-files: CodingGuidelines: Documentation/*.txt are the sources
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions