From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 30 May 2010 12:44:52 GMT
Subject: Re: [PATCH] Improve error message in rebase conflict
Message-ID: <AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com>
In-Reply-To: <1275222044-511-1-git-send-email-artagnon@gmail.com>

Heya,

On Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
>                git diff-files --quiet --ignore-submodules || {
> -                       echo "You must edit all merge conflicts and then"
> -                       echo "mark them as resolved using git add"
> +                       echo "You must edit all merge conflicts and then" \
> +                           "mark them as resolved using 'git add'"

Why is this change not described in the commit message? :)

-- 
Cheers,

Sverre Rabbelier