author | Aleksey Pivovarov <AMPivovarov@gmail.com> | |
Tue, 11 Aug 2015 12:41:01 +0000 (15:41 +0300) | ||
committer | Aleksey Pivovarov <AMPivovarov@gmail.com> | |
Wed, 12 Aug 2015 16:55:48 +0000 (19:55 +0300) | ||
commit | 6e7bcd7e1d3f180428abad317e71419b5210c343 | |
tree | 1ed9b9a53c250b2424cd5965cce07a5b1e73cc37 | tree |
parent | 355d978b63f287e7b47506757e6346831ba0bea4 | commit | diff |
platform/diff-impl/src/com/intellij/diff/merge/TextMergeTool.java | diff | blob | history | |
platform/platform-resources-en/src/messages/DiffBundle.properties | diff | blob | history |