summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Caffee <allan.caffee@gmail.com>2009-04-13 18:10:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-27 16:36:14 (GMT)
commit345f6e2cb547007da48ef503f00070cdcca04975 (patch)
treea471b7a6835d742856127625ac84f20e0da42411
parentc2318228ab327999520b2e5dbc9edbd619a73105 (diff)
downloadgit-345f6e2cb547007da48ef503f00070cdcca04975.zip
git-345f6e2cb547007da48ef503f00070cdcca04975.tar.gz
git-345f6e2cb547007da48ef503f00070cdcca04975.tar.bz2
builtin-merge: fix a typo in an error message
Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index d0bf1fc..370d003 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -703,7 +703,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"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];