Show what we're merging.
Helps folk figure out conflicts.
This commit is contained in:
parent
fbdbef8bf6
commit
b6bd9d0b4c
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user