From f36f483d1e85e4b7a55e3da28ad647c1a6b619fa Mon Sep 17 00:00:00 2001
From: Owen Clarke <o.clarke@gmail.com>
Date: Mon, 5 Mar 2012 08:26:08 +1100
Subject: [PATCH] Bug #944

- Fixed merge.t failing when run on an NFS share
---
 ChangeLog    | 1 +
 test/merge.t | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 674fa5252..38a79f0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -279,6 +279,7 @@
  + Fixed bug #937, which failed 'stat' calls on Solaris (thanks to Owen Clarke).
  + Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen
    Clarke).
+ + Fixed bug #944, which caused a test to fail when it was run on an NFS share.
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.
diff --git a/test/merge.t b/test/merge.t
index 461c1bf04..980ce11e8 100755
--- a/test/merge.t
+++ b/test/merge.t
@@ -203,6 +203,7 @@ if (open my $fh, 'local/undo.data') {
 			}
 		}
 	}
+	close $fh;
 } else {
 	fail ("could not open local/undo.data");
 }
@@ -223,6 +224,7 @@ if (open my $fh, 'remote/undo.data') {
 			}
 		}
 	}
+	close $fh;
 } else {
 	fail ("could not open remote/undo.data");
 }