Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3404: fix a grammo (commands are ran -> commands are run)
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 0cc465ec5d13385dd8ecdbd64387cf937c82bce3..b831293b3865ae52584565039e4a893c3c6f45ff 100644
(file)
--- 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;