diff options
| -rw-r--r-- | ll-merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index 8ea03e536a..5c73274b13 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -46,7 +46,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; |