summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-13 23:37:52 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-13 23:37:52 -0700
commite5a78b1ca8b62aee8567d67f0e0db5ac7706806a (patch)
treea6a51f523f6ec691f24bc085bd05ec9decb6122e /merge-recursive.c
parent1974632c664c2d573b36a00fa993c1c13dd8a967 (diff)
downloadgit-e5a78b1ca8b62aee8567d67f0e0db5ac7706806a.tar.gz
builtin-prune.c: forgot TYPE => OBJ changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions