[PATCH] ll-merge: fix typo in comment
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 14, 2016, 22:12 UTC
- Message-ID
- <xmqqbn5bg7r4.fsf@gitster.mtv.corp.google.com>
When a944af1d (merge: teach -Xours/-Xtheirs to binary ll-merge driver, 2012-09-08) introduced FAVOR_OURS/FAVOR_THEIRS to the binary ll-merge driver, it changed what happens to the merge result for the outer merge, and updated the comment from:
The tentative merge result is "ours" for the final round, or
common ancestor for an internal merge. Still return "conflicted
merge" status.to
The tentative merge result is the or common ancestor for an
internal merge.What happened is obvious. I noticed the lack of definitive article in front of "common" but failed to remove "or". Also I forgot to describe what I did for the final merge, probably because I was satisified by the description in the log message.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- ll-merge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ll-merge.c b/ll-merge.c index ff4a43a..fe22412 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -47,7 +47,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused, assert(opts); /* - * The tentative merge result is the or common ancestor for an internal merge. + * The tentative merge result is the common ancestor for an + * internal merge. For the final merge, it is "ours" by + * default but -Xours/-Xtheirs can tweak the choice. */ if (opts->virtual_ancestor) { stolen = orig;