X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.h;h=b831293b3865ae52584565039e4a893c3c6f45ff;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=0cc465ec5d13385dd8ecdbd64387cf937c82bce3;hpb=6c6f87842bcb8ac4d36922cec5b5ce25de14756e;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index 0cc465ec5..b831293b3 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -10,7 +10,7 @@ struct merge_options {
 	enum {
 		MERGE_RECURSIVE_NORMAL = 0,
 		MERGE_RECURSIVE_OURS,
-		MERGE_RECURSIVE_THEIRS,
+		MERGE_RECURSIVE_THEIRS
 	} recursive_variant;
 	const char *subtree_shift;
 	unsigned buffer_output : 1;