summaryrefslogtreecommitdiff
path: root/t/t9801-git-p4-branch.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 15:24:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 15:24:14 -0800
commitce8781e8ab66fb90fb7baf8d953a4582a06571a7 (patch)
tree85d3248a398a4549dc8ca8d00ad36bf94bdf4a6c /t/t9801-git-p4-branch.sh
parentMerge branch 'jc/maint-pack-object-cycle' (diff)
parentShow error for 'git merge' with unset merge.defaultToUpstream (diff)
downloadtgif-ce8781e8ab66fb90fb7baf8d953a4582a06571a7.tar.xz
Merge branch 'vr/git-merge-default-to-upstream'
* vr/git-merge-default-to-upstream: Show error for 'git merge' with unset merge.defaultToUpstream
Diffstat (limited to 't/t9801-git-p4-branch.sh')
0 files changed, 0 insertions, 0 deletions