summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Marco Costalba <mcostalba@gmail.com>2007-11-04 15:35:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-05 20:50:38 -0800
commitd8e21ba8967f43b61fc2fd50dd749ff8f0c6592a (patch)
tree9e50bb8be20c3d801e513aae1aa6f392a8650bdb /merge-recursive.c
parentgrep with unmerged index (diff)
downloadtgif-d8e21ba8967f43b61fc2fd50dd749ff8f0c6592a.tar.xz
Remove a couple of duplicated include
Signed-off-by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions