~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Committer: Robert Collins
Date: 2005-10-06 13:08:14 UTC
mfrom: (1185.12.13)
mto: (1417.1.4) (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1419.
Revision ID: robertc@robertcollins.net-20051006130814-90d99eeecdb3218f

Merge Aarons conflict plugin for 0.1rc1

added added

removed removed

* 'bzr status' now shows unknown files inside a selected directory.

Patch from Heikki Paajanen.

* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'

and 'resolve' have needed added, which list and remove those

merge conflicts respectively. A conflicted tree cannot be committed

in. Contributed by Aaron Bentley.

INTERNALS: