comment

diff --git a/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_4_a32011c9b6911e4d2256d6ebaeacf7df._comment b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_4_a32011c9b6911e4d2256d6ebaeacf7df._comment
new file mode 100644 (file)
index 0000000..152abe3
--- /dev/null
+++ b/doc/todo/resolve_merge_conflicts_with_smallfiles/comment_4_a32011c9b6911e4d2256d6ebaeacf7df._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2021-06-25T16:12:02Z"
+ content="""
+I have no interest in continung a feature added for the assistant down a
+road to making source code files that are checked into git be handled in
+some other way when merging.
+"""]]