Viewing all changes in revision 5008.1.1.
- Committer: Vincent Ladeuil
- Date: 2010-02-05 10:57:26 UTC
- mfrom: (4597.3.74 dont-add-conflict-helpers)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100205105726-i0t82c1yjwrgxgzp
Add --take-this and --take-other actions to bzr resolve
- files added:
- bzrlib/help_topics/es
- files removed:
- bzrlib/help_topics/es
- files renamed:
- bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt
- files modified:
- NEWS
expand all
collapse all
added
removed
