aboutsummaryrefslogtreecommitdiffstats
path: root/libbe
diff options
context:
space:
mode:
Diffstat (limited to 'libbe')
-rw-r--r--libbe/bzr.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py
index 7aa6a58..b53429c 100644
--- a/libbe/bzr.py
+++ b/libbe/bzr.py
@@ -121,7 +121,8 @@ def postcommit(directory):
try:
invoke_client('merge', directory=directory)
except CommandError, e:
- if 'No merge branch known or specified' in e.err_str:
+ if ('No merge branch known or specified' in e.err_str or
+ 'No merge location known or specified' in e.err_str):
pass
else:
status = invoke_client('revert', '--no-backup',