From fbf62ce74c85f8a6af682418f4a26ad3f06c6cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Sun, 22 Oct 2023 18:30:24 +0200 Subject: [PATCH] Only show base conflict lines when preference says so --- .../instance/conflictLines.on..st | 10 +++++++--- .../methodProperties.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Squot.package/SquotCodeConflictChange.class/instance/conflictLines.on..st b/src/Squot.package/SquotCodeConflictChange.class/instance/conflictLines.on..st index 7d09f14ae..e48c7065e 100644 --- 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 index bd6a48f14..b07d47cb4 100644 --- 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",