summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-28 00:46:39 -0700
commitb79376cdf3bd6ee922261776613d085a7b36ffd9 (patch)
tree544b5717e8c87ad8c8770273e9c79ff494441c0d /builtin-merge.c
parent47afed5dc17faf10fde18789b17cf6ebff829cf4 (diff)
parent2254da06a5473ffde973337bad2c6a96eea61e20 (diff)
downloadgit-b79376cdf3bd6ee922261776613d085a7b36ffd9.tar.gz
Merge branch 'maint'
* maint: 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index 6a51823a55..0b58e5eda1 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"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];