kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: Fix typo 

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2010-08-17 17:52:27 -06:00 committed by Junio C Hamano
parent dd5685818b
commit a3e4136754
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1021,7 +1021,7 @@ static int process_renames(struct merge_options *o,
sha_eq(mfi.sha, ren1->pair->two->sha1) && sha_eq(mfi.sha, ren1->pair->two->sha1) &&
mfi.mode == ren1->pair->two->mode) { mfi.mode == ren1->pair->two->mode) {
/* /*
* This messaged is part of * This message is part of
* t6022 test. If you change * t6022 test. If you change
* it update the test too. * it update the test too.
*/ */