« back to all changes in this revision
Viewing changes to bzrlib/merge3.py
- Committer: Martin Pool
- Date: 2010-02-02 10:13:33 UTC
- mto: (4999.3.1 apport)
- mto: This revision was merged to the branch mainline in revision 5002.
- Revision ID: mbp@sourcefrog.net-20100202101333-zlhf25w3yb03yg5j
Don't call os.getuid on win32 (thanks gzlist)
- files modified:
- bzrlib/crash.py
added
removed
bzrlib/merge3.py
