Skip to content

Commit

Permalink
Add docstring to merge module
Browse files Browse the repository at this point in the history
  • Loading branch information
jaraco committed Sep 8, 2023
1 parent cb255a5 commit 121e05b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions jaraco/develop/merge.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
"""
Facilities for parsing and resolving common merge conflicts.
"""

import re
import textwrap
import contextlib
Expand Down

0 comments on commit 121e05b

Please sign in to comment.