diff options
| -rwxr-xr-x | bin/merge-driver-ekeyword | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index f75056c..e59e10c 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -127,7 +127,7 @@ def main(argv: Sequence[str]) -> int: sys.exit(result) else: result = os.system(f"git merge-file -L HEAD -L base -L ours {A} {O} {B}") - sys.exit(0 if result == 0 else -1) + sys.exit(result) if __name__ == "__main__": |