summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Kacper Kornet <draenog@pld-linux.org>2013-03-17 23:17:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-17 15:38:23 -0700
commit617cf93182279eec554dda03f44ac6a250e183aa (patch)
treee4509c103138f43053baec48ffde49d6831a293f /mergetools/p4merge
parentrev-parse: clarify documentation of $name@{upstream} syntax (diff)
downloadtgif-617cf93182279eec554dda03f44ac6a250e183aa.tar.xz
t1507: Test that branchname@{upstream} is interpreted as branch
Syntax branchname@{upstream} should interpret its argument as a name of a branch. Add the test to check that it doesn't try to interpret it as a refname if the branch in question does not exist. Signed-off-by: Kacper Kornet <draenog@pld-linux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions