#!/bin/bash

branch=""
[ "$1" = "-t" ] && {
        branch="-t $2"
        shift 2
}

file="$*"

gitk --merge -- $file &
[ "$file" ] && gvim $file 2>/dev/null