X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=resolve-undo.c;h=174ebec9e573b1942e379942037f38500bd19b97;hb=fc051572a3fe171286f10761bd33946c48de3f7f;hp=8b935594aaa707a6eff146a998250196ae2a654b;hpb=78a395d371ec9fd14297178ec98b8b1042a64fb6;p=git.git

diff --git a/resolve-undo.c b/resolve-undo.c
index 8b935594a..174ebec9e 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -135,7 +135,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
 			pos++;
 		return pos - 1; /* return the last entry processed */
 	}
-	item = string_list_lookup(ce->name, istate->resolve_undo);
+	item = string_list_lookup(istate->resolve_undo, ce->name);
 	if (!item)
 		return pos;
 	ru = item->util;