Rev 5009: (vila) Add --take-this and --take-other actions to bzr resolve in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5009 [merge]
revision-id: pqm at pqm.ubuntu.com-20100205113358-wd4d49omal1hus75
parent: pqm at pqm.ubuntu.com-20100204171617-8mbadia84bys1fr6
parent: v.ladeuil+lp at free.fr-20100205105726-i0t82c1yjwrgxgzp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-02-05 11:33:58 +0000
message:
  (vila) Add --take-this and --take-other actions to bzr resolve
removed:
  bzrlib/help_topics/es/         bzrlibhelp_topicses-20100104142927-3zk9dhyzgw3dqtkl-1
added:
  bzrlib/help_topics/es/         bzrlibhelp_topicses-20091223160038-qyu0zdzjfbx76ud7-1
renamed:
  bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/help_topics/en/conflict-types.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3

Diff too large for email (1492 lines, the limit is 1000).