summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-01-11 18:31:09 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-11 16:35:38 -0800
commit2ea09b5ace46bf8292afe9c2b83b4a6580218bdf (patch)
tree0264652010d366e88b3943578f21ecacec37ff6c /git-mergetool--lib.sh
parentgit-p4: clarify comment (diff)
downloadtgif-2ea09b5ace46bf8292afe9c2b83b4a6580218bdf.tar.xz
git-p4: adjust test to adhere to stricter useClientSpec
This test relied on what now is seen as broken behavior in --use-client-spec. Change it to make sure it works according to the new behavior as described in ecb7cf9 (git-p4: rewrite view handling, 2012-01-02) and c700b68 (git-p4: test client view handling, 2012-01-02). Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions