/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Vincent Ladeuil
  • Date: 2010-02-02 12:52:13 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100202125213-h08auwpb9zbtvjmb
Settle with --take-this and --take-other as action names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
45
45
  ``locations.conf`` or ``branch.conf``.
46
46
  (Ted Gould, Matthew Fuller, Vincent Ladeuil)
47
47
 
48
 
* Tree-shape conflicts can be resolved by providing ``--keep-mine`` and
49
 
  ``--take-theirs`` to the ``bzr resolve`` command. Just marking the conflict
 
48
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
 
49
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
50
50
  as resolved is still accessible via the ``--done`` default action.
51
51
  (Vincent Ladeuil)
52
52