summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2014-04-20 13:43:37 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-21 10:41:38 -0700
commit3667a5b67423ff727569628e903146d970b74095 (patch)
tree28b27859b85cc7310010ab6b14a487f3eb5f6de7 /merge.c
parenttransport-helper: fix sync issue on crashes (diff)
downloadtgif-3667a5b67423ff727569628e903146d970b74095.tar.xz
t5801 (remote-helpers): cleanup environment sets
Commit 512477b (tests: use "env" to run commands with temporary env-var settings) missed some variables in the remote-helpers test. Also standardize these. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions