Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/decimal-width-for-uintmax'
[gitweb.git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index 44c697c36d0b406330aeb084db1d6a4be715d6c6..468a2eb92c6d72c519faf5c8203d3d41d520c12d 100644
(file)
--- 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)