?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 816118f) | patch
IDEA-23416 (IDEA>Settings>Editor>Colors&Fonts>File Status> "Merged with conflicts...
commit46b6d52529ca46f0126b230889f7b2f4ad1460af
authorIrina Chernushina <Irina.Chernushina@jetbrains.com>
Mon, 22 Jun 2009 15:38:05 +0000 (22 19:38 +0400)
committerIrina Chernushina <Irina.Chernushina@jetbrains.com>
Mon, 22 Jun 2009 15:38:05 +0000 (22 19:38 +0400)
treed10e8e0fc95068b5087a1ee27620e88b69726878tree | snapshot (tar.gz zip)
parent816118ff6927497a9373ebc7587783cf21bd29b3commit | diff
IDEA-23416 (IDEA>Settings>Editor>Colors&Fonts>File Status> "Merged with conflicts" displayed two times)
platform-api/src/com/intellij/openapi/vcs/FileStatus.java diff | blob | blame | history
platform-resources_eng/src/messages/VcsBundle.properties diff | blob | blame | history
Patches for IntelliJ IDEA package in Fedora