Viewing all changes in revision 4597.3.63.
- Committer: Vincent Ladeuil
- Date: 2010-01-05 17:06:38 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100105170638-5355y6f8go0luo52
That's take-theirs not take-their.
- files modified:
- NEWS
expand all
collapse all
added
removed
