Show what we're merging.

Helps folk figure out conflicts.
This commit is contained in:
Robert Collins 2014-08-11 22:29:57 +12:00
parent fbdbef8bf6
commit b6bd9d0b4c
1 changed files with 1 additions and 0 deletions

View File

@ -118,6 +118,7 @@ def main():
ref = resolved_refs[ref]
else:
ref = 'refs/changes/%s' % ref
print 'merging in %s' % ref
check_call(['git', 'merge', '--no-edit', ref], cwd=rd)
if dirty:
check_call(['git', 'stash', 'pop'], cwd=rd)