Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Fix typo
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index b0f055ecd49f215dd5fb5b8432247ca9504d1b47..52936c35aec413ad8adf10cdd0a80f9bd282abd2 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1021,7
+1021,7
@@
static int process_renames(struct merge_options *o,
sha_eq(mfi.sha, ren1->pair->two->sha1) &&
mfi.mode == ren1->pair->two->mode) {
/*
- * This message
d
is part of
+ * This message is part of
* t6022 test. If you change
* it update the test too.
*/