#!/bin/sh git-resolve-script HEAD $1 "`pwd` branch '$1'"