Commit 3adc42c1 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Print diff instead of status when conflicted

parent d0a81caf
......@@ -159,6 +159,7 @@ module EESpecificCheck
if status.porcelain == ''
status.head
else
diff = run_git_command("diff")
run_git_command("rebase --abort")
say <<~MESSAGE
......@@ -182,9 +183,9 @@ module EESpecificCheck
💥 If you would like to help, or have any questions, please
💥 contact @godfat
⚠️ Git status:
⚠️ Git diff:
#{status.porcelain}
#{diff}
MESSAGE
exit(255)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment