From 0c78636ff93594fd9a8c2ec873c74229ff8bc8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= <github.marius@doerbandt.de>
Date: Sun, 22 Oct 2023 17:53:02 +0200
Subject: [PATCH] Add SquotPreferences with showBase preference

---
 src/Squot.package/SquotPreferences.class/README.md |  0
 .../SquotPreferences.class/class/showBase..st      |  3 +++
 .../SquotPreferences.class/class/showBase.st       |  7 +++++++
 .../SquotPreferences.class/methodProperties.json   |  6 ++++++
 .../SquotPreferences.class/properties.json         | 14 ++++++++++++++
 5 files changed, 30 insertions(+)
 create mode 100644 src/Squot.package/SquotPreferences.class/README.md
 create mode 100644 src/Squot.package/SquotPreferences.class/class/showBase..st
 create mode 100644 src/Squot.package/SquotPreferences.class/class/showBase.st
 create mode 100644 src/Squot.package/SquotPreferences.class/methodProperties.json
 create mode 100644 src/Squot.package/SquotPreferences.class/properties.json

diff --git a/src/Squot.package/SquotPreferences.class/README.md b/src/Squot.package/SquotPreferences.class/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Squot.package/SquotPreferences.class/class/showBase..st b/src/Squot.package/SquotPreferences.class/class/showBase..st
new file mode 100644
index 000000000..f190abc54
--- /dev/null
+++ b/src/Squot.package/SquotPreferences.class/class/showBase..st
@@ -0,0 +1,3 @@
+merging
+showBase: aBoolean
+	ShowBase := aBoolean.
\ No newline at end of file
diff --git a/src/Squot.package/SquotPreferences.class/class/showBase.st b/src/Squot.package/SquotPreferences.class/class/showBase.st
new file mode 100644
index 000000000..00c09fc45
--- /dev/null
+++ b/src/Squot.package/SquotPreferences.class/class/showBase.st
@@ -0,0 +1,7 @@
+merging
+showBase
+	<preference: 'Show base in merge conflicts'
+		categoryList: #('Git expert settings')
+		description: 'If true, shows not only the current and incoming versions, but also the version of the merge base in merge conflicts.'
+		type: #Boolean>
+	^ ShowBase ifNil: [false]
\ No newline at end of file
diff --git a/src/Squot.package/SquotPreferences.class/methodProperties.json b/src/Squot.package/SquotPreferences.class/methodProperties.json
new file mode 100644
index 000000000..c3438e485
--- /dev/null
+++ b/src/Squot.package/SquotPreferences.class/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		"showBase" : "mad 10/19/2023 18:20",
+		"showBase:" : "mad 10/19/2023 18:28" },
+	"instance" : {
+		 } }
diff --git a/src/Squot.package/SquotPreferences.class/properties.json b/src/Squot.package/SquotPreferences.class/properties.json
new file mode 100644
index 000000000..f98811cf1
--- /dev/null
+++ b/src/Squot.package/SquotPreferences.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Squot-Mapper-Utilities",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		"ShowBase" ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "SquotPreferences",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }