summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-06-22 16:03:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-22 13:17:12 -0700
commitfb58c8d50734c14a90f3e4e7dd99f36e4f37c4e6 (patch)
treed9e21b6047e0c56c736c9ed410747874a8f5e932 /git-mergetool.sh
parentinitial_ref_transaction_commit(): check for ref D/F conflicts (diff)
downloadtgif-fb58c8d50734c14a90f3e4e7dd99f36e4f37c4e6.tar.xz
refs: move the remaining ref module declarations to refs.h
Some functions from the refs module were still declared in cache.h. Move them to refs.h. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions