# HG changeset patch
# User Jeff Hammel <k0scist@gmail.com>
# Date 1727958979 25200
# Node ID 74dc16f074be85908668b3bb0de609d048474ad3
# Parent  02b31a76e2c47da3f33b572493a50d0b02b2d985
ignore ff merges

diff -r 02b31a76e2c4 -r 74dc16f074be .gitconfig
--- a/.gitconfig	Sun Jun 02 16:35:01 2024 -0700
+++ b/.gitconfig	Thu Oct 03 05:36:19 2024 -0700
@@ -33,3 +33,5 @@
 	submoduleSummary = true
 [gpg]
 	format = ssh
+[merge]
+	ff = no