« back to all changes in this revision
Viewing changes to bzrlib/merge3.py
- Committer: Robert Collins
- Date: 2005-09-14 17:23:14 UTC
- mfrom: (974.1.82)
- mto: (1185.41.1 bzr.sftp) (1393.2.1) (1092.3.4) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1390.
- Revision ID: robertc@robertcollins.net-20050914172314-4c220f175bb62fe0
merge from aaron - fixes bare excepts, adds ancestor namespace
- files modified:
- bzrlib/branch.py
added
removed
bzrlib/merge3.py
