merge two files for version difference

merge is a function
merge ()
{
    ( diff -e $1 $2;
    echo w ) | ed - $1
}