Bazaar

  1. Bug #660935
  2. Comment #9

Comment 9 for bug 660935

Revision history for this message
Glenn Morris (rgm+lp) wrote :

In the meantime, can I get the desired result by doing:

bzr revert src/unexalpha.c.OTHER
rm src/unexalpha.c.BASE
bzr resolve src/unexalpha.c

? It seems to produce the right end state, but I'd like to check before I start using it...