local mbase=`git merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
echo "not ff $ancestor..$now, $mbase != $ancestor"
local mbase=`git merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
echo "not ff $ancestor..$now, $mbase != $ancestor"