gmerge: default to current branch, fail for master