/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/externalcommand.py

  • Committer: Gary van der Merwe
  • Date: 2009-09-15 11:22:27 UTC
  • mto: (4634.46.1 2.0-integration)
  • mto: This revision was merged to the branch mainline in revision 4702.
  • Revision ID: garyvdm@gmail.com-20090915112227-jcrujse8j1ytsb7h
Revert rename of test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/externalcommand.py
20
20
 
21
21
 
22
22
import os
 
23
import sys
23
24
 
24
25
from bzrlib.commands import Command
 
26
from bzrlib.osutils import pathjoin
25
27
 
26
28
 
27
29
class ExternalCommand(Command):