diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:45:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:45:08 -0800 |
| commit | 045c05048530b8c57c410886e5f64d91a44c2c83 (patch) | |
| tree | ab68728e79a4e97bb16fe0bedbf9468daeaed585 /builtin-merge.c | |
| parent | 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e (diff) | |
| parent | e2ced7de19c85f3b246480bfacdcc934c98c08ca (diff) | |
| download | git-045c05048530b8c57c410886e5f64d91a44c2c83.tar.gz | |
Merge branch 'mm/maint-merge-ff-error-message-fix'
Conflicts:
merge-recursive.c
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 855cf6545e..fc7066e3c7 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -656,6 +656,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote) opts.verbose_update = 1; opts.merge = 1; opts.fn = twoway_merge; + opts.msgs = get_porcelain_error_msgs(); trees[nr_trees] = parse_tree_indirect(head); if (!trees[nr_trees++]) |