X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=resolve-undo.c;h=468a2eb92c6d72c519faf5c8203d3d41d520c12d;hb=0082d82183b42c19fe7db1531279ff6d3f86c3fe;hp=44c697c36d0b406330aeb084db1d6a4be715d6c6;hpb=b47761dd1e9aeafdc847b2f235aba81f8a3bdf7d;p=git-core%2Fgit.git

diff --git a/resolve-undo.c b/resolve-undo.c
index 44c697c36..468a2eb92 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -110,7 +110,7 @@ void resolve_undo_clear_index(struct index_state *istate)
 	string_list_clear(resolve_undo, 1);
 	free(resolve_undo);
 	istate->resolve_undo = NULL;
-	istate->cache_changed = 1;
+	istate->cache_changed |= RESOLVE_UNDO_CHANGED;
 }
 
 int unmerge_index_entry_at(struct index_state *istate, int pos)