Skip to content

Commit

Permalink
Specify merge tool for hg rebase
Browse files Browse the repository at this point in the history
Otherwise we might fall back into editor, what is not something we want
to execute.

Issue #684

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel committed Apr 7, 2015
1 parent 136c02f commit 48d5ef2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion weblate/trans/vcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ def rebase(self, branch=None, abort=False):
self.execute(['rebase', '--abort'])
else:
try:
self.execute(['rebase'])
self.execute(['rebase', '--tool', 'internal:merge'])
except RepositoryException as error:
if error.retcode == 1:
self.execute(['update'])
Expand Down

0 comments on commit 48d5ef2

Please sign in to comment.