.git_helpers/hooks/post-rewrite

Sun, 31 Dec 2017 14:42:54 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Sun, 31 Dec 2017 14:42:54 -0500
changeset 666
0cf4a2458e49
parent 180
96dbe6a6008d
permissions
-rwxr-xr-x

add conflict marker highlight

#!/bin/sh
case "$1" in
  rebase) exec .git/hooks/post-merge ;;
esac

mercurial