summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Sahil Dua <sahildua2305@gmail.com>2017-05-28 19:12:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-29 13:18:43 +0900
commitb8f354f294185eac98bb6978f9f92ba11932558b (patch)
tree4487dcb1b916c9db98b7f458db3c6182ac011d17 /mergetools/p4merge
parentGit 2.10.3 (diff)
downloadtgif-b8f354f294185eac98bb6978f9f92ba11932558b.tar.xz
branch test: fix invalid config key access
Fixes the test by changing "branch.s/s/dummy" to "branch.s/s.dummy" which is the right way of accessing config key "branch.s/s.dummy". Purpose of this test is to confirm that this key doesn't exist after the branch "s/s" has been renamed to "s". Earlier it was trying to access invalid config key and hence was getting an error. However, this wasn't caught because we were expecting the command to fail for other reason as mentioned above. Signed-off-by: Sahil Dua <sahildua2305@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions