From 8a359819273a4460d5806d2d5e76cd7993a84843 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Wed, 25 Apr 2007 22:07:45 +0200 Subject: Add a test for merging changed and rename-changed branches Also leave a warning for future merge-recursive explorers. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- merge-recursive.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 37f1ba93fe..094ac59e69 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1345,6 +1345,11 @@ static int process_renames(struct path_list *a_renames, if (mfi.merge && mfi.clean && sha_eq(mfi.sha, ren1->pair->two->sha1) && mfi.mode == ren1->pair->two->mode) + /* + * This messaged is part of + * t6022 test. If you change + * it update the test too. + */ output(3, "Skipped %s (merged same as existing)", ren1_dst); else { if (mfi.merge || !mfi.clean) -- cgit v1.2.1