Viewing all changes in revision 4597.14.2.
- Committer: Vincent Ladeuil
- Date: 2010-11-10 16:24:31 UTC
- mto: This revision was merged to the branch mainline in revision 5558.
- Revision ID: v.ladeuil+lp@free.fr-20101110162431-zm06mtpvz75wzubh
Implements --take-this and --take-other when resolving text conflicts
expand all
collapse all
added
removed
