Skip to content

Commit a628605

Browse files
committed
[conflict-mediator] Use BaseException instead
1 parent 5b232fe commit a628605

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

conflict_mediator/download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ def setup(verbose: bool = False):
6161
run_command(["git", "merge", "A", "--no-edit"], verbose)
6262
try:
6363
run_command(["git", "merge", "B", "--no-edit"], verbose)
64-
except Exception:
64+
except BaseException:
6565
print("Fix the merge conflict in script.py!")

0 commit comments

Comments
 (0)