Bazaar

  1. Bug #677328
  2. Comment #3

Comment 3 for bug 677328

Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

lp:~vila/bzr/638451-malformed fixes the bug correctly (by taking the other file) while bzr trunk doesn't give a traceback, but also doesn't resolve the conflict and also gives no feedback on why the command did not resolve the conflict. I consider that a slight UI bug, but I'll refrain from filling it if 638451 will land soon.