From a275d91fef28d1b360a6a8a65216c81c5405badf Mon Sep 17 00:00:00 2001 From: Superhats Date: Tue, 28 Aug 2018 19:33:02 +0200 Subject: [PATCH] let's unfuck those sprites --- tools/icon_merge_tool/icon_merge_tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/icon_merge_tool/icon_merge_tool.py b/tools/icon_merge_tool/icon_merge_tool.py index 8cfd701d8bb..aa8931c30e4 100644 --- a/tools/icon_merge_tool/icon_merge_tool.py +++ b/tools/icon_merge_tool/icon_merge_tool.py @@ -60,7 +60,7 @@ def main(relative_root): path = icon_conflicts[i] print("{}: {}".format("Merging", path)) - common_ancestor_hash = run_shell_command("git merge-base ORIG_HEAD master").strip() + common_ancestor_hash = run_shell_command("git merge-base MERGE_HEAD HEAD").strip() ours_icon = NamedTemporaryFile(delete=False) theirs_icon = NamedTemporaryFile(delete=False)