diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 85e97f3277c4..e8f09119a631 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+<<<<<<< .mine
+2008-10-30  Steven G. Kargl  <kargls@comcast.net>
+
+	PR fortran/37930
+	* gfortran.dg/int_conv_2.f90:  New test.
+
+=======
 2008-10-30  Mikael Morin  <mikael.morin@tele2.fr>
 
         PR fortran/37903
@@ -8,6 +15,7 @@
         PR fortran/37749
         * gfortran.dg/vector_subscript__5.f90: New test.
 
+>>>>>>> .r141488
 2008-10-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.target/s390/pr36822.c: Avoid cast to pointer from integer
diff --git a/gcc/testsuite/gfortran.dg/int_conv_2.f90 b/gcc/testsuite/gfortran.dg/int_conv_2.f90
new file mode 100644
index 000000000000..ce5f5a21712c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/int_conv_2.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/37930
+program test
+  implicit none
+  integer i
+  i = transfer(-1,1.0) ! { dg-error "Conversion" }
+end program test