From 121e05bfb1a1db6be8868b37ce197aeaaa7e7689 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 8 Sep 2023 10:44:39 -0400
Subject: [PATCH] Add docstring to merge module

---
 jaraco/develop/merge.py | 4 ++++
 1 file changed, 4 insertions(+)

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