Only show base conflict lines when preference says so

hpi-swa · Oct 22, 2023 · fbf62ce · fbf62ce
1 parent 0c78636
commit fbf62ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Squot.package/SquotCodeConflictChange.class/instance/conflictLines.on..st b/src/Squot.package/SquotCodeConflictChange.class/instance/conflictLines.on..st
@@ -5,9 +5,13 @@ conflictLines: aConflict on: aStream
 			({(SquotTextUtilities monospace: self conflictMarkerLeft), ' current'},
 			aConflict left).
 		self baseColor ->
-			({(SquotTextUtilities monospace: self conflictMarkerBase), ' base'},
-			aConflict original,
-			{SquotTextUtilities monospace: self conflictMarkerSeparator}).
+			(SquotPreferences showBase
+				ifTrue: [
+					{(SquotTextUtilities monospace: self conflictMarkerBase), ' base'},
+					aConflict original,
+					{SquotTextUtilities monospace: self conflictMarkerSeparator}]
+				ifFalse: [
+					{SquotTextUtilities monospace: self conflictMarkerSeparator}]).
 		self rightColor ->
 			(aConflict right,
 			{(SquotTextUtilities monospace: self conflictMarkerRight), ' incoming'}).

diff --git a/src/Squot.package/SquotCodeConflictChange.class/methodProperties.json b/src/Squot.package/SquotCodeConflictChange.class/methodProperties.json
@@ -12,7 +12,7 @@
 		"conflict" : "mad 9/7/2023 19:47",
 		"conflict:" : "mad 9/7/2023 19:49",
 		"conflictIntervalAndResolutionSurrounding:in:" : "mad 10/22/2023 17:45",
-		"conflictLines:on:" : "mad 9/10/2023 18:34",
+		"conflictLines:on:" : "mad 10/22/2023 18:28",
 		"conflictMarkerBase" : "mad 9/10/2023 13:24",
 		"conflictMarkerLeft" : "mad 9/10/2023 13:24",
 		"conflictMarkerRight" : "mad 9/10/2023 13:25",