Add files to ignore on merge conflict if the 'ours' driver is configured