summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-08-26 04:10:43 -0400
committerJunio C Hamano <junkio@cox.net>2006-08-26 17:35:15 -0700
commitde530aaa4b57b1edd9b973d814d7df8354752ccc (patch)
tree489044d36ea92c1135956c091d833a0eacd3966d /git-merge.sh
parenta7f051987c5f020e60da1e5d6ddefc3d443d3299 (diff)
downloadgit-de530aaa4b57b1edd9b973d814d7df8354752ccc.tar.gz
Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.
This function was moved above unpack_delta_entry so we can call it from within unpack_delta_entry without a forward declaration. This change looks worse than it is. Its really just a relocation of unpack_non_delta_entry to earlier in the file and renaming the function to unpack_compressed_entry. No other changes were made. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions