summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2007-02-03 23:49:16 -0500
committerJunio C Hamano <junkio@cox.net>2007-02-03 21:49:54 -0800
commit3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7 (patch)
tree86fe6fa503b65e19b37dceb5b7613602267a9bb1 /merge-recursive.c
parent0f3908758947b2279f5d2d4a294653d76a62d468 (diff)
downloadgit-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.gz
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index fa320eb6b1..a5e68457f4 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -386,7 +386,7 @@ struct rename
};
/*
- * Get information of all renames which occured between 'o_tree' and
+ * Get information of all renames which occurred between 'o_tree' and
* 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
* 'b_tree') to be able to associate the correct cache entries with
* the rename information. 'tree' is always equal to either a_tree or b_tree.
@@ -1175,7 +1175,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)
/*
* Merge the commits h1 and h2, return the resulting virtual
- * commit object and a flag indicating the cleaness of the merge.
+ * commit object and a flag indicating the cleanness of the merge.
*/
static int merge(struct commit *h1,
struct commit *h2,
@@ -1222,8 +1222,8 @@ static int merge(struct commit *h1,
/*
* When the merge fails, the result contains files
* with conflict markers. The cleanness flag is
- * ignored, it was never acutally used, as result of
- * merge_trees has always overwritten it: the commited
+ * ignored, it was never actually used, as result of
+ * merge_trees has always overwritten it: the committed
* "conflicts" were already resolved.
*/
discard_cache();