Viewing all changes in revision 1185.80.4.
- Committer: John Arbash Meinel
- Date: 2006-02-10 21:16:48 UTC
- mto: (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1657.
- Revision ID: john@arbash-meinel.com-20060210211648-4d8be6daa956ca87
We need to reference the basis_tree to get the proper executable bits.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
