SVN: first step in properties conflict support: visualize, have status
commit709e3ae63619fff4fae0341a3286117c2c9e578b
authorIrina Chernushina <Irina.Chernushina@jetbrains.com>
Thu, 26 Mar 2009 08:01:02 +0000 (26 11:01 +0300)
committerIrina Chernushina <Irina.Chernushina@jetbrains.com>
Thu, 26 Mar 2009 08:01:02 +0000 (26 11:01 +0300)
treefd43793cac099f7dba0fa721ebf239934e79ce8f
parentf4bfa35da35c5ec1a7d35ac7f83b069e899e4ae0
SVN: first step in properties conflict support: visualize, have status
platform-api/src/com/intellij/openapi/vcs/FileStatus.java
platform-resources_eng/src/messages/VcsBundle.properties
vcs-api/src/com/intellij/openapi/vcs/update/FileGroup.java
vcs-api/src/com/intellij/openapi/vcs/update/UpdatedFiles.java