SVN: ignore-whitespace option when merge
commit230eeb83599723efbace5f5c358d6f4cce6e3458
authorIrina Chernushina <Irina.Chernushina@jetbrains.com>
Mon, 24 Nov 2008 08:52:32 +0000 (24 11:52 +0300)
committerIrina Chernushina <Irina.Chernushina@jetbrains.com>
Mon, 24 Nov 2008 08:52:32 +0000 (24 11:52 +0300)
tree2a18012bded62b1622a87abd728486b670cd740e
parent3b9179aea1889e0ba5b44b58e2ecfa7505f7daa4
SVN: ignore-whitespace option when merge
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java