Use custom git commit message
Git and Vim setup for efficient conflict resolution