branch

• api-draft
• fix-release-none
• handle-error-output-type
• martinal/topic-add-merge-strategies
• martinal/topic-merge-conflict-resolution
• martinal/topic-refactor-diff-algorithms
• martinal/topic-refactor-diffing
• martinal/topic-use-argparse
• master
• new-list-merge-algorithm
• topic-prettydiff-fallback

tag