Comment 2 for bug 5798

Bug still present in bzr.dev

Test case:

$ bzr init foo
$ cd foo
$ echo a > a
$ bzr commit -m a
$ cd ..
$ bzr branch foo bar
$ echo b >> foo/a
$ bzr commit -m b foo/a
$ echo c >> bar/a
$ bzr commit -m c bar/a
$ cd bar
$ bzr merge ../foo
# This creates a conflict

$ bzr commit
# This brings up the commit editor, which even shows that there is a conflict, but doesn't stop processing until the commit editor returns.