Don't keep around .orig after successful manual merge
SourceTree quick launch