git-whatchangedon commit git-resolve-script: stop when the automated merge fails (e5b905c)
   1#!/bin/sh
   2git-rev-list HEAD | git-diff-tree --stdin -v -r "$@" | LESS="$LESS -S" ${PAGER:-less}