From 8ce2eb6567984a77b587a78920be0ef08f44dc81 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 5 Mar 2013 15:08:56 +0000
Subject: [PATCH] fix bug#38450

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36277 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog              | 5 +++++
 Source/NSFileManager.m | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 78403ea17..b0968b911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-05  Larry Campbell <lcampbel@akamai.com>
+
+        * Source/NSFileManager.m: Fix for ([-contentsEqualAtPath:andPath:])
+        compare contents of regular files in subdirectories.
+
 2012-03-05 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
 
         * Source/NSFileManager.m:
diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m
index 8d0029b8e..36451bc4c 100644
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@@ -690,7 +690,8 @@ static NSStringEncoding	defaultEncoding;
 	    {
 	      ok = NO;
 	    }
-	  else if ([t isEqual: NSFileTypeDirectory])
+	  else if ([t isEqual: NSFileTypeDirectory]
+            || [t isEqual: NSFileTypeRegular])
 	    {
 	      ok = [self contentsEqualAtPath: p1 andPath: p2];
 	    }