Signed-off-by: Junio C Hamano <junkio@cox.net>
static int unpack_trees_rec(struct tree_entry_list **posns, int len,
const char *base, merge_fn_t fn, int *indpos)
{
static int unpack_trees_rec(struct tree_entry_list **posns, int len,
const char *base, merge_fn_t fn, int *indpos)
{
if (first)
printf("index %s\n", first);
if (first)
printf("index %s\n", first);
for (i = 0; i < len; i++) {
if (!posns[i] || posns[i] == &df_conflict_list)
continue;
for (i = 0; i < len; i++) {
if (!posns[i] || posns[i] == &df_conflict_list)
continue;
printf("%d %s\n", i + 1, posns[i]->name);
printf("%d %s\n", i + 1, posns[i]->name);
if (!first || entcmp(first, firstdir,
posns[i]->name,
posns[i]->directory) > 0) {
if (!first || entcmp(first, firstdir,
posns[i]->name,
posns[i]->directory) > 0) {
printf("%s:\n", first);
for (i = 0; i < src_size; i++) {
printf(" %d ", i);
printf("%s:\n", first);
for (i = 0; i < src_size; i++) {
printf(" %d ", i);
printf("Added %d entries\n", ret);
printf("Added %d entries\n", ret);
*indpos += ret;
} else {
for (i = 0; i < src_size; i++) {
*indpos += ret;
} else {
for (i = 0; i < src_size; i++) {