tree d73c55875616862da1471898b8b29003ccffe152
parent 157dc07368faf6537af1d2ce676a4f2dda2f71a6
author Junio C Hamano <junkio@cox.net> 1134333886 -0800
committer Junio C Hamano <junkio@cox.net> 1134333886 -0800

t/t6022: a new test for renaming merge.

This adds a couple of tests to cover the following renaming
merge cases:

 - one side renames and the other side does not, with and without
   content conflicts.

 - both side rename to the same path, with and without content
   conflicts.

The test setup also prepares a case in which both side rename to
different destination, but currently the code collapses these
destination paths and removes the original path, which may be
wrong.  The outcome of this case is not checked by the tests in
this round.

Signed-off-by: Junio C Hamano <junkio@cox.net>