Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
cache.h | 1 +
resolve-undo.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h
index 4133797..7155052 100644
--- a/cache.h
+++ b/cache.h
@@ -272,6 +272,7 @@ static inline unsigned int canon_mode(unsigned int mode)
#define CE_ENTRY_REMOVED (1 << 1)
#define CE_ENTRY_ADDED (1 << 2)
#define SOMETHING_CHANGED (1 << 3) /* unclassified changes go here */
+#define RESOLVE_UNDO_CHANGED (1 << 4)
struct index_state {
struct cache_entry **cache;
diff --git a/resolve-undo.c b/resolve-undo.c
index 44c697c..468a2eb 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)
--
1.9.1.346.ga2b5940
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
