summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:38 -0800
commit1eba20c04545750d04fd6c8dda4b18db83c863fa (patch)
tree6e883513b4edd976511c3dd09b2bd1577e91729b /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'jk/unify-exit-code-by-receiving-signal' (diff)
parentdocs: manpage XML depends on asciidoc.conf (diff)
downloadtgif-1eba20c04545750d04fd6c8dda4b18db83c863fa.tar.xz
Merge branch 'jn/xml-depends-on-asciidoc-conf'
* jn/xml-depends-on-asciidoc-conf: docs: manpage XML depends on asciidoc.conf
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions