.git_helpers/hooks/post-merge@2f0a718712d1
.git_helpers/hooks/post-merge
2019-12-03
- author
- Meredith Howard <mhoward@roomag.org>
- date
- Tue, 03 Dec 2019 12:53:50 -0600 (2019-12-03)
- changeset 836
- 2f0a718712d1
- parent 447
- 8ef69d160a72
- permissions
- -rwxr-xr-x
fix conflict marker hl
