You might like to join the currenty active list thread (by Vincent etc) about how conflict marks and bzr resolve _should_ work in future. -- Martin <http://launchpad.net/~mbp/>