OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
l10n: Add Catalan translation
[git-core/git.git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index
44c697c
..
468a2eb
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)