Add function to open git conflicts in vim