mhoward/dotfiles: .git_helpers/hooks/post-merge@0cf4a2458e49 (annotated)

.git_helpers/hooks/post-merge@0cf4a2458e49 (annotated)

.git_helpers/hooks/post-merge

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 447: 8ef69d160a72
permissions: -rwxr-xr-x

add conflict marker highlight

180 96dbe6a6008d ctags tweaking Meredith Howard <mhoward@roomag.org> parents: diff changeset	1	#!/bin/sh
447 8ef69d160a72 simpler args Meredith Howard <mhoward@roomag.org> parents: 444 diff changeset	2	git ctags hook 2>/dev/null