From: Allan Caffee <allan.caffee@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] builtin-merge: fix a typo in an error message
Date: Mon, 13 Apr 2009 17:41:15 -0400 [thread overview]
Message-ID: <b2e43f8f0904131441j4d808431mc2c87531221c8f4d@mail.gmail.com> (raw)
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.
next prev parent reply other threads:[~2009-04-13 21:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-13 18:10 [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 ` Allan Caffee [this message]
2009-04-13 23:12 ` Miklos Vajna
2009-04-27 15:41 ` Allan Caffee
2009-04-27 16:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b2e43f8f0904131441j4d808431mc2c87531221c8f4d@mail.gmail.com \
--to=allan.caffee@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).