Fix conflict

kemayo · Sep 29, 2011 · fcd3970 · fcd3970
2 parents b6c808d + 4633f81
commit fcd3970
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git.py b/git.py
@@ -398,7 +398,7 @@ def run(self, edit):
 
 class GitBranchCommand(GitCommand):
     def run(self, edit):
-        self.run_command(['git', 'branch'], self.branch_done)
+        self.run_command(['git', 'branch', '--no-color'], self.branch_done)
 
     def branch_done(self, result):
         self.results = result.rstrip().split('\n')