--- a/Tools__ChangeSetDiffTool.st Tue Feb 07 13:27:23 2017 +0100
+++ b/Tools__ChangeSetDiffTool.st Tue Feb 07 13:28:14 2017 +0100
@@ -2480,14 +2480,13 @@
!
diffsetChanged
-
| ds |
ds := self diffsetHolder value.
ds depth = 2 ifTrue:[
- self beTwoColumn.
+ self beTwoColumn.
] ifFalse:[
- self beSingleColumn.
+ self beSingleColumn.
].
self hasDiffsetHolder value: ds notNil.
self canSaveHolder value: self canSave.
@@ -2495,11 +2494,11 @@
self diffsetHolderPrivate value:
- (self isOneColumnBrowser
- ifTrue:[ds flattened sort]
- ifFalse:[ds value sort]).
+ (self isOneColumnBrowser
+ ifTrue:[ds flattened sort]
+ ifFalse:[ds value sort]).
self autoMoveToNextConflictHolder value ifTrue:[
- self menuMoveDownConflict.
+ self menuMoveDownConflict.
].
self versionALabelHolder value: ds versionALabel.
self versionBLabelHolder value: ds versionBLabel.
@@ -2507,7 +2506,7 @@
self updateViews.
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>"
+ "Modified: / 29-06-2011 / 08:24:18 / Jan Vrany"
"Modified: / 21-01-2013 / 21:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2740,7 +2739,7 @@
self diffset: (ChangeSetDiff versionA: a versionB: b).
"Created: / 21-03-2011 / 23:23:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 29-06-2011 / 08:10:17 / Jan Vrany <enter your email here>"
+ "Modified: / 29-06-2011 / 08:10:17 / Jan Vrany"
"Modified: / 06-07-2011 / 12:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!