hirochachacha

## post-merge
#!/bin/sh --
set -e

echo ""
echo "START POST-MERGE HOOK"
echo ""

HOOK_DIR=`dirname $0`      #git_hooks directory
PROC_DIR="$HOOK_DIR/../.." #vimproc directory
	#!/bin/sh --
	set -e

	echo ""
	echo "START POST-MERGE HOOK"
	echo ""

	HOOK_DIR=`dirname $0` #git_hooks directory
	PROC_DIR="$HOOK_DIR/../.." #vimproc directory