I want to specify that the custom merge driver that I'm using is in the root directory of my repository, named mergebans.py. I've tried the following for paths...
- ./mergebans
- ../mergebans
- ./mergebans.py
- ../mergebans.py
- /home/steam/.config/SCP Secret Laboratory
- /home/steam/.config/SCP\ Secret\ Laboratory
$ git merge master
../mergebans.py .merge_file_h3Bq8r .merge_file_2sLmCK .merge_file_H38i62 7: 1: ../mergebans.py .merge_file_h3Bq8r .merge_file_2sLmCK .merge_file_H38i62 7: ../mergebans.py: not found
../mergebans.py .merge_file_knuMAl .merge_file_Pg9f5D .merge_file_Gb0JzW 7: 1: ../mergebans.py .merge_file_knuMAl .merge_file_Pg9f5D .merge_file_Gb0JzW 7: ../mergebans.py: not found
$ git merge master
../mergebans.py .merge_file_TBZ2ia .merge_file_dHaTFA .merge_file_7wEJ20 7: 1: ../mergebans.py .merge_file_TBZ2ia .merge_file_dHaTFA .merge_file_7wEJ20 7: ../mergebans.py: not found
../mergebans.py .merge_file_pzgQqr .merge_file_rvHXOR .merge_file_TYk5ci 7: 1: ../mergebans.py .merge_file_pzgQqr .merge_file_rvHXOR .merge_file_TYk5ci 7: ../mergebans.py: not found
$ git merge master
/home/steam/.config/SCP Secret Laboratory/mergebans .merge_file_sDGMpM .merge_file_GiChes .merge_file_2JJM27 7: 1: /home/steam/.config/SCP Secret Laboratory/mergebans .merge_file_sDGMpM .merge_file_GiChes .merge_file_2JJM27 7: /home/steam/.config/SCP: not found
/home/steam/.config/SCP Secret Laboratory/mergebans .merge_file_OacBRN .merge_file_4qUpGt .merge_file_ElPev9 7: 1: /home/steam/.config/SCP Secret Laboratory/mergebans .merge_file_OacBRN .merge_file_4qUpGt .merge_file_ElPev9 7: /home/steam/.config/SCP: not found
$ git merge master
fatal: bad config line 21 in file .git/config
How do I fix my .git/config to locate the mergebans.py file properly?
