git.ozlabs.org Git - next-scripts/blob - merge_helper

   1 #!/bin/bash
   2
   3 branch=""
   4 [ "$1" = "-t" ] && {
   5         branch="-t $2"
   6         shift 2
   7 }
   8
   9 file="$*"
  10
  11 gitk --merge -- $file &
  12 [ "$file" ] && gvim $file 2>/dev/null