tree 5bf9ddfab3c0c09f76885659adafe192ad004283
parent b91db2707a4a3c48982c5fa052cf7ee3da8616cf
author Yann Dirson <ydirson@altern.org> 1136680788 +0100
committer Junio C Hamano <junkio@cox.net> 1136752393 -0800

Add a test for rebase when a change was picked upstream

This test exercises the standard feature that makes rebase useful.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>