summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-23 21:16:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-23 21:16:38 -0800
commit6a3d05da55a488a4f5b2c3b2091f4445fa3847e9 (patch)
tree65fbe4f7eb5ef3dc8e0dad87955b0fda339cb20b /mergetools/meld
parentMerge branch 'jc/makefile-perl-python-path-doc' (diff)
parentt9402: Use TABs for indentation (diff)
downloadtgif-6a3d05da55a488a4f5b2c3b2091f4445fa3847e9.tar.xz
Merge branch 'mo/cvs-server-updates'
Various git-cvsserver updates. * mo/cvs-server-updates: t9402: Use TABs for indentation t9402: Rename check.cvsCount and check.list t9402: Simplify git ls-tree t9402: Add missing &&; Code style t9402: No space after IO-redirection t9402: Dont use test_must_fail cvs t9402: improve check_end_tree() and check_end_full_tree() t9402: sed -i is not portable cvsserver Documentation: new cvs ... -r support cvsserver: add t9402 to test branch and tag refs cvsserver: support -r and sticky tags for most operations cvsserver: Add version awareness to argsfromdir cvsserver: generalize getmeta() to recognize commit refs cvsserver: implement req_Sticky and related utilities cvsserver: add misc commit lookup, file meta data, and file listing functions cvsserver: define a tag name character escape mechanism cvsserver: cleanup extra slashes in filename arguments cvsserver: factor out git-log parsing logic
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions