summaryrefslogtreecommitdiff
path: root/merge-ort.h
diff options
context:
space:
mode:
Diffstat (limited to 'merge-ort.h')
-rw-r--r--merge-ort.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-ort.h b/merge-ort.h
index d53a0a3..c011864 100644
--- a/merge-ort.h
+++ b/merge-ort.h
@@ -29,6 +29,8 @@ struct merge_result {
* !clean) and to print "CONFLICT" messages. Not for external use.
*/
void *priv;
+ /* Also private */
+ unsigned _properly_initialized;
};
/*