summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-08 12:33:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-08 12:33:35 -0700
commit68590435c147b3fdd4cbb1c068b2f9d793c02246 (patch)
tree3bd9543ff448026d54c0559cb54dbafd31363faa /t/t7605-merge-resolve.sh
parentMerge branch 'jl/submodule-status-summary-doc' (diff)
parentreflog: actually default to subcommand 'show' (diff)
downloadtgif-68590435c147b3fdd4cbb1c068b2f9d793c02246.tar.xz
Merge branch 'ms/reflog-show-is-default'
* ms/reflog-show-is-default: reflog: actually default to subcommand 'show'
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions