Viewing all changes in revision 4869.3.5.
- Committer: Andrew Bennetts
- Date: 2009-12-16 07:03:03 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-20091216070303-bm3sexgv0dcoh7kd
Hook is invoked for delete vs. change conflicts, and may choose to result in deleting the file.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
