Merge branch 'jk/diff-algo' into maint

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index a0d796e57087e0ca5bac94520997ecacec9fd295..67b1e7b463fd26f202e7265baaf14c68aa3bd818 100755 (executable)
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -4167,7 +4167,7 @@ sub convertToDbMode
     #  this half-converted form, but it isn't currently worth the
     #  backwards compatibility headaches.
 
-    $mode=~/^\d\d(\d)\d{3}$/;
+    $mode=~/^\d{3}(\d)\d\d$/;
     my $userBits=$1;
 
     my $dbMode = "";