From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Sun, 29 Nov 2009 12:18:31 GMT
Subject: [PATCH 0/2] User-friendly error messages for merge failure on fast-forward.
Message-ID: <1259497113-1393-1-git-send-email-Matthieu.Moy@imag.fr>

I noticed that failures of fast-forward merges were still using the
plumbing error message:

$ git merge master
Updating 1fdeef9..e248dad
error: Entry 'foo.txt' not uptodate. Cannot merge.

I'm not 100% sure that my patch doesn't trigger the porcelain behavior
for plumbing. Someone more familiar than me with the codebase should
confirm/infirm this.

Matthieu Moy (2):
  merge-recursive: make the error-message generation an extern function
  builtin-merge: show user-friendly error messages for fast-forward
    too.

 builtin-merge.c   |    1 +
 merge-recursive.c |   41 +++++++++++++++++++++++------------------
 merge-recursive.h |    3 +++
 3 files changed, 27 insertions(+), 18 deletions(-)