diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-05-01 12:55:43 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-05-01 12:55:43 -0700 |
| commit | 8fb0021093e7d978cc06043ba4c06b0a47778294 (patch) | |
| tree | b95f5f920574415ae49b26ad6abac86eb6d7b38d /plugins/svn4idea | |
| parent | b17587c84879dd2ea42495f1fbdadbc806b9475b (diff) | |
| download | idea-8fb0021093e7d978cc06043ba4c06b0a47778294.tar.gz | |
Snapshot dddb119296e7ee16fa8180784610b89b89112ebb from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: I5fe892d3e4d06009445cc2270aa90bb57dea9d39
Diffstat (limited to 'plugins/svn4idea')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java index bdc5b7e5fd5f..4c582d01557d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java @@ -150,7 +150,7 @@ public class SvnMergeProvider implements MergeProvider { } } - public boolean isBinary(final VirtualFile file) { + public boolean isBinary(@NotNull final VirtualFile file) { SvnVcs vcs = SvnVcs.getInstance(myProject); try { SVNWCClient client = vcs.createWCClient(); |