Viewing all changes in revision 4869.3.16.
- Committer: Andrew Bennetts
- Date: 2009-12-22 08:00:29 UTC
- mto: (4869.3.19 per-file-merge-hook-491711) (4973.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4975.
- Revision ID: andrew.bennetts@canonical.com-20091222080029-1abio4a8k8itecix
Move handling of winner==OTHER case into generic hook path too.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
