From 47e16390a938064df0591d9811bfaa922c7a4627 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 28 Oct 2014 15:06:09 +0300
Subject: [PATCH] Added test with conflicting function overloads in different
 files.

---
 .../tests/redeclarations/RedeclarationInMultiFile.kt        | 6 +++++-
 .../tests/redeclarations/RedeclarationInMultiFile.txt       | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
index 8808a9155ac..e75d37a5cf0 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt
@@ -1,5 +1,9 @@
 // FILE: a.kt
 val <!REDECLARATION, REDECLARATION!>a<!> : Int = 1
+<!CONFLICTING_OVERLOADS!>fun f()<!> {
+}
 
 // FILE: b.kt
-val <!REDECLARATION, REDECLARATION!>a<!> : Int = 1
\ No newline at end of file
+val <!REDECLARATION, REDECLARATION!>a<!> : Int = 1
+<!CONFLICTING_OVERLOADS!>fun f()<!> {
+}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.txt
index 696ac75eace..ca4673f7097 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.txt
@@ -2,3 +2,5 @@ package
 
 internal val a: kotlin.Int = 1
 internal val a: kotlin.Int = 1
+internal fun f(): kotlin.Unit
+internal fun f(): kotlin.Unit