Merge branch 'svn_18_3'

author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>

Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)

committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>

Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
author Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
committer Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java
Simple merge
diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java
Simple merge
diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java
Simple merge
diff --cc plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java
Simple merge
author	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
committer	Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
	Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
		1	2
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java	patch \|	diff1 \|	diff2 \|	blob \| history