summaryrefslogtreecommitdiff
path: root/reflog-walk.c
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-04-25 22:07:45 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-25 23:43:16 -0700
commit8a359819273a4460d5806d2d5e76cd7993a84843 (patch)
tree2744717ade03e7d2958a26b0fb070c706f079ecd /reflog-walk.c
parentc135ee88f8584996ead993c76015d2c03798ab9e (diff)
downloadgit-8a359819273a4460d5806d2d5e76cd7993a84843.tar.gz
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 'reflog-walk.c')
0 files changed, 0 insertions, 0 deletions