summaryrefslogtreecommitdiff
path: root/t/t9603/cvsroot/CVSROOT
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
commit746b6fb96852accae8a4163f6edda23a4c6de0c7 (patch)
treeadf9a485ba9e9c2a8c6378edba0b7bf652ca5b0b /t/t9603/cvsroot/CVSROOT
parentMerge branch 'jk/userdiff-config-simplify' (diff)
parentmergetools/meld: Use --help output to detect --output support (diff)
downloadtgif-746b6fb96852accae8a4163f6edda23a4c6de0c7.tar.xz
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 't/t9603/cvsroot/CVSROOT')
0 files changed, 0 insertions, 0 deletions