.git_helpers/hooks/post-merge@0cf4a2458e49
.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
