def abort_merge():
"""Abort a merge by reading the tree at HEAD."""
# Reset the worktree
git.read_tree('HEAD', reset=True, u=True, v=True)
# remove MERGE_HEAD
merge_head = git.git_path('MERGE_HEAD')
if core.exists(merge_head):
core.unlink(merge_head)
# remove MERGE_MESSAGE, etc.
merge_msg_path = merge_message_path()
while merge_msg_path:
core.unlink(merge_msg_path)
merge_msg_path = merge_message_path()
def abort_merge():
"""Abort a merge by reading the tree at HEAD."""
# Reset the worktree
git.read_tree("HEAD", reset=True, u=True, v=True)
# remove MERGE_HEAD
merge_head = git.git_path("MERGE_HEAD")
if core.exists(merge_head):
core.unlink(merge_head)
# remove MERGE_MESSAGE, etc.
merge_msg_path = merge_message_path()
while merge_msg_path:
core.unlink(merge_msg_path)
merge_msg_path = merge_message_path()