diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-28 11:46:20 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 11:46:20 +0400 |
| commit | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch) | |
| tree | 9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 /builtin-merge.c | |
| parent | cc137194519a8ddbc0514da088fb012bea40df51 (diff) | |
| parent | c922b01f54c4bebe84daeacf014cfbc8dc68479b (diff) | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
grep: fix segfault when "git grep '('" is given
Documentation: fix a grammatical error in api-builtin.txt
builtin-merge: fix a typo in an error message
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 cf869751b4..2179e0686d 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -785,7 +785,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]; |