diff options
| author |  Allan Caffee <allan.caffee@gmail.com> | 2009-04-13 14:10:08 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-27 09:36:14 -0700 |
| commit | 345f6e2cb547007da48ef503f00070cdcca04975 (patch) | |
| tree | a471b7a6835d742856127625ac84f20e0da42411 /builtin-merge.c | |
| parent | test-genrandom: Add newline to usage string (diff) | |
| download | tgif-345f6e2cb547007da48ef503f00070cdcca04975.tar.xz | |
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>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index d0bf1fc1ed..370d0034ca 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]; |