aboutsummaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-24 00:36:00 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-18 00:46:13 -0800
commit525ab63950e324823dd45423104cdcf5e46e2610 (patch)
tree4ab4dcee4a942ad6b0877bfc1f508d34932a339a /sha1_name.c
parent3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (diff)
downloadgit-525ab63950e324823dd45423104cdcf5e46e2610.tar.gz
git-525ab63950e324823dd45423104cdcf5e46e2610.tar.xz
merge-recursive: split low-level merge functions out.
This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions