diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 3d8af10003..453fb642b3 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -277,6 +277,7 @@ def merge_replay( os.environ["PATH"] += os.pathsep + os.path.join( os.getcwd(), "src/scripts/merge_tools" ) + os.environ["GIT_CONFIG_GLOBAL"] = os.getcwd() + "/.gitconfig" logger.info(f"Replaying merge with index {args.idx}") if args.delete_workdir: