commands: migrate status and branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
commands: migrate status and branch
manifest hash: 7d893a81a81539173fc74d86152062a1a70bed13
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCnhESywK+sNU5EO8RAlBJAKCmv2gHefMOXfX/UUCy1tfV0cOqOQCfbeX8
oaT15B7GBL2lcalGrPXkzY8=
=8gVe
-----END PGP SIGNATURE-----
merge $1 $3 $2 || tkdiff -conflict $1 -o $1