#GH363 - Custom markers for sdiff
GH363-custom-markers-for-sdiff
GH368-Git-repo-node Review 1 Solved
GH368-Git-repo-node Review 1 Solved(1)
#405 - Propagate sync and conflict flags directly from algorithm -
solved conflicts and sync, solved tests for them
#368 - Merge remote-tracking branch 'origin/GH368-Git-repo-node-review1'

Conflicts:
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitUtils.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/controller/GitBranchAndTagPropertiesProvider.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/controller/GitPropertiesProvider.java
#405 - Propagate sync and conflict flags directly from algorithm -
removed hardcoded path for file, disabled controllers during sync
Merge remote-tracking branch 'origin/master' into GH405-propagate-flags-from-codesync-algorithm
Merge remote-tracking branch 'origin/master' into GH363-custom-markers-for-sdiff
#363 - Custom markers for sdiff - first revision
#417 - Sdiff Tests
#405 - Propagate sync and conflict flags directly from algorithm - first
revision
#417 - Sdiff Tests (2)
#417 - Switch on diffType
Merge remote-tracking branch 'origin/master' into GH417-sdiff-unit-tests
Merge remote-tracking branch 'origin/GH363-custom-markers-for-sdiff'
Merge branch 'master' into GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/controller/GitPropertiesProvider.java
	org.flowerplatform.tests/META-INF/MANIFEST.MF
Merge remote-tracking branch 'origin/master' into
GH362-comment-icon-propagation

Conflicts:
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/CodeSyncSdiffPlugin.java
Merge remote-tracking branch
'origin/GH405-propagate-flags-from-codesync-algorithm'
#36 - solved merge problems; now both custom flags and codesync flag
work properly