diff --git a/jaraco/develop/merge.py b/jaraco/develop/merge.py index 0b58758..c536c64 100644 --- a/jaraco/develop/merge.py +++ b/jaraco/develop/merge.py @@ -1,3 +1,7 @@ +""" +Facilities for parsing and resolving common merge conflicts. +""" + import re import textwrap import contextlib