fixed typo in entry_with_update.py (#1306)
This commit is contained in:
parent
f85c10338c
commit
bc4cbbd9d9
@ -37,7 +37,7 @@ try:
|
|||||||
repo.reset(local_branch.target, pygit2.GIT_RESET_HARD)
|
repo.reset(local_branch.target, pygit2.GIT_RESET_HARD)
|
||||||
print("Fast-forward merge")
|
print("Fast-forward merge")
|
||||||
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
|
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
|
||||||
print("Update failed - Did you modified any file?")
|
print("Update failed - Did you modify any file?")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print('Update failed.')
|
print('Update failed.')
|
||||||
print(str(e))
|
print(str(e))
|
||||||
|
Loading…
Reference in New Issue
Block a user