Browse Source

merge-recursive: Fix typo

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 15 years ago committed by Junio C Hamano
parent
commit
a3e4136754
  1. 2
      merge-recursive.c

2
merge-recursive.c

@ -1021,7 +1021,7 @@ static int process_renames(struct merge_options *o, @@ -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 messaged is part of
* This message is part of
* t6022 test. If you change
* it update the test too.
*/

Loading…
Cancel
Save