![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Wed, 25 Apr 2007 20:07:45 +0000 (22:07 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 26 Apr 2007 06:43:16 +0000 (23:43 -0700) | ||
| commit | 8a359819273a4460d5806d2d5e76cd7993a84843 | |
| tree | 2744717ade03e7d2958a26b0fb070c706f079ecd | tree | snapshot |
| parent | c135ee88f8584996ead993c76015d2c03798ab9e | commit | diff |
Add a test for merging changed and rename-changed branches
Also leave a warning for future merge-recursive explorers.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Also leave a warning for future merge-recursive explorers.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diff | blob | history | |
| t/t6022-merge-rename.sh | diff | blob | history |