new status output

[Scott James Remnant]

On Fri, 2005-10-21 at 12:17 +0200, Matthieu Moy wrote:

> Scott James Remnant <scott at ubuntu.com> writes:
> 
> > I really should finish converting my baz-conflicts-mode 
> 
> URL ?
> 
http://people.ubuntu.com/~scott/software/bzr-conflicts.el

It took all of about 5 minutes to convert <g>

(For the baz one, grab baz-conflicts.el instead).


Do M-x bzr-conflicts and pick a bzr project tree with conflicts after a
merge in it; you'll get a buffer listing the conflicts, select a file
and it'll be opened with the smerge minor mode.

Use C-c ^ n etc. to go between the blocks and pick the resolution.  When
you save the file, if there are no more conflict markers, bzr resolve is
called for you and the file disappears from the conflict list.

Basically makes a nice work flow for resolving conflicts.

Scott
-- 
Scott James Remnant
scott at ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051021/5533e1cf/attachment.pgp