diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2007-04-25 22:07:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-25 23:43:16 -0700 |
| commit | 8a359819273a4460d5806d2d5e76cd7993a84843 (patch) | |
| tree | 2744717ade03e7d2958a26b0fb070c706f079ecd /commit.c | |
| parent | Avoid excessive rewrites in merge-recursive (diff) | |
| download | git-8a359819273a4460d5806d2d5e76cd7993a84843.tar.gz git-8a359819273a4460d5806d2d5e76cd7993a84843.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions