Update 'finish' to accept 'git-merge' arguments