summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-26 15:55:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-26 15:55:26 -0700
commit922239e7da03f8e0a8c6ba809c1ee0cf3776f94a (patch)
treeeca2a9d3076556c99dc8891bb13600870c93ef65 /mergetools/ecmerge
parentMerge branch 'jk/repository-extension' (diff)
parentgit-p4: import the ctypes module (diff)
downloadtgif-922239e7da03f8e0a8c6ba809c1ee0cf3776f94a.tar.xz
Merge branch 'dk/p4-import-ctypes'
"git-p4" tried to use from ctypes module without first importing it. * dk/p4-import-ctypes: git-p4: import the ctypes module
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions