diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:25 -0700 |
| commit | 2254da06a5473ffde973337bad2c6a96eea61e20 (patch) | |
| tree | c7b1bf0ba4094dbc3e6f209e379a15b66d6864aa /builtin-merge.c | |
| parent | f06b9f1dffa67c1d28793bdaf7b2165d3d392d35 (diff) | |
| parent | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (diff) | |
| download | git-2254da06a5473ffde973337bad2c6a96eea61e20.tar.gz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
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 6d2160d0a3..c339380cf3 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -765,7 +765,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]; |