Martin Pool wrote:
> Public bug reported:
>
> Some people would like an option to run their editor on all the
> conflicted files after the merge. If they resolve the conflicts
> (removing the conflict markers) then the files should be considered
> resolved.
This is very easy to script:
$EDITOR $(bzr conflicts --text) && bzr resolved
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Pool wrote:
> Public bug reported:
>
> Some people would like an option to run their editor on all the
> conflicted files after the merge. If they resolve the conflicts
> (removing the conflict markers) then the files should be considered
> resolved.
This is very easy to script:
$EDITOR $(bzr conflicts --text) && bzr resolved
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iD8DBQFGnDfT0F+ nu1YWqI0RAodTAJ 4jiXa+KTTuQoWOM 0HzxFVGqaqCGACa A7IM iQZ7FdLo=
VfqYbmNRyCXR7Wt
=606R
-----END PGP SIGNATURE-----