Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Re: [PATCH] builtin-merge: fix a typo in an error message

From: Allan Caffee <hidden>
Date: 2016-06-15 22:46:36

On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Allan Caffee <redacted>
---
 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help