:mod:`wizard.merge` =================== .. automodule:: wizard.merge Functions --------- .. autofunction:: merge Utility functions ----------------- .. autofunction:: git_commit_tree .. autofunction:: git_diff_text .. autofunction:: get_newline .. autofunction:: convert_newline Exceptions ---------- .. autoexception:: Error .. autoexception:: MergeError :show-inheritance: