aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-08-21 03:10:36 -0400
committerJunio C Hamano <junkio@cox.net>2006-08-21 20:26:14 -0700
commit44c10841ea3edeef47cc6be0fdba5058344e2e95 (patch)
treec9ca390c1a9bc13e87f8ca77287b30b116af3486 /merge-file.c
parentda7560110f91088ee2a664e98f75ff54e0d9e1e1 (diff)
downloadgit-44c10841ea3edeef47cc6be0fdba5058344e2e95.tar.gz
git-44c10841ea3edeef47cc6be0fdba5058344e2e95.tar.xz
Remove unnecessary forward declaration of unpack_entry.
This declaration probably used to be necessary but the code has been refactored since to use unpack_entry_gently instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions