From: Allan Caffee <allan.caffee@gmail.com>
Date: Mon, 13 Apr 2009 21:41:15 GMT
Subject: Re: [PATCH] builtin-merge: fix a typo in an error message
Message-ID: <b2e43f8f0904131441j4d808431mc2c87531221c8f4d@mail.gmail.com>
In-Reply-To: <20090413181008.GA8273@linux.vnet>

On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee <allan.caffee@gmail.com> wrote:
>
> Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
> ---
>  builtin-merge.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge.c b/builtin-merge.c
> index 6a51823..0b58e5e 100644
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -764,7 +764,7 @@ static int suggest_conflicts(void)
>
>        fp = fopen(git_path("MERGE_MSG"), "a");
>        if (!fp)
> -               die("Could open %s for writing", git_path("MERGE_MSG"));
> +               die("Could not open %s for writing", git_path("MERGE_MSG"));

On second thought this commit message should probably read something more like:

builtin-merge.c: correct error message for failed open

Since the original message is actually wrong.