resolve           312 builtin/merge-tree.c 		resolve(info, NULL, entry+1);
resolve           319 builtin/merge-tree.c 			resolve(info, entry+1, entry+2);
resolve           331 builtin/merge-tree.c 		resolve(info, NULL, entry+1);