summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2013-01-14 19:47:07 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-15 09:46:30 -0800
commitaf8c0092503f677afc9ea4070ebd9204133b83ab (patch)
tree51744de72e6a2b393e55f92b8b12e79633dc4328 /git-merge-resolve.sh
parentgit p4: fix sync --branch when no master branch (diff)
downloadtgif-af8c0092503f677afc9ea4070ebd9204133b83ab.tar.xz
git p4 test: keep P4CLIENT changes inside subshells
Tests assume that this is set to something valid. Make sure that the 'clone --use-client-spec' does not leak its changes out into the rest of the tests. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions