Viewing all changes in revision 2590.2.17.
- Committer: Aaron Bentley
- Date: 2007-07-12 17:46:52 UTC
- mto: This revision was merged to the branch mainline in revision 2617.
- Revision ID: abentley@panoramicfeedback.com-20070712174652-vof6knvyoca27gsk
Avoid redundant conflict check
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
