Viewing all changes in revision 5067.1.1.
- Committer: Vincent Ladeuil
- Date: 2010-03-02 08:17:39 UTC
- mfrom: (4597.2.29 529968-content-conflict-rename-on-resolve)
- mto: This revision was merged to the branch mainline in revision 5068.
- Revision ID: v.ladeuil+lp@free.fr-20100302081739-pjqlb2hqw1lgnybn
Resolve --take-this or --take-other correctly rename kept file
- files modified:
- NEWS
expand all
collapse all
added
removed
