Commitbb8be82

authored

Update merge.py

1 parent8424d07 commitbb8be82Copy full SHA for bb8be82

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ def main():`
`127`	`127`	`remove_old_files(downstream-upstream)`
`128`	`128`	`clean_paths((upstream-downstream)\| (upstream&downstream))`
`129`	`129`	`shutil.rmtree(pot_path)`
`130`		`-run("powrap",".po","/*.po")`
	`130`	`+run("powrap","-m")`
`131`	`131`	`update_makefile(args.cpython_repo)`
`132`	`132`	`git_add_relevant_files()`
`133`	`133`

Comments

(0)