From 6c306a34eef49beb3db5500f6f29190c799ace4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Fri, 13 Jun 2014 19:19:29 +0700 Subject: resolve-undo: be specific what part of the index has changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- resolve-undo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resolve-undo.c') diff --git a/resolve-undo.c b/resolve-undo.c index e9dff57824..468a2eb92c 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 = SOMETHING_CHANGED; + istate->cache_changed |= RESOLVE_UNDO_CHANGED; } int unmerge_index_entry_at(struct index_state *istate, int pos) -- cgit v1.2.3