@@ -217,7 +217,8 @@ sub blob_diffs {

       from_file => $from_file,

       lines => $lines,

       add_line_count => $diff_info->{add_line_count},

-      delete_line_count => $diff_info->{delete_line_count}

+      delete_line_count => $diff_info->{delete_line_count},

+      binary => $diff_info->{binary}

     };

     # Diff tree info

@@ -228,6 +229,7 @@ sub blob_diffs {

         $diff_tree->{delete_line_count} = $diff_info->{delete_line_count};

         $diff_tree->{add_block_count} = $diff_info->{add_block_count};

         $diff_tree->{delete_block_count} = $diff_info->{delete_block_count};

+        $diff_tree->{binary} = $diff_info->{binary};

         last;

       }

     }

@@ -1011,7 +1013,9 @@ sub last_change_commit {

 sub parse_blob_diff_lines {

   my ($self, $lines) = @_;

-  

+

+  my $diff_info = {};

+

   # Parse

   my @lines;

   my $next_before_line_num;

@@ -1019,13 +1023,15 @@ sub parse_blob_diff_lines {

   my $add_line_count = 0;

   my $delete_line_count = 0;

   for my $line (@$lines) {

+    warn $line;

+    

     chomp $line;

     my $class;

     my $before_line_num;

     my $after_line_num;

-    if ($line =~ /^@@\s-(\d+),\d+\s\+(\d+),\d+/) {

+    if ($line =~ /^@@\s-(\d+)(?:,\d+)?\s\+(\d+)/) {

       $next_before_line_num = $1;

       $next_after_line_num = $2;

@@ -1047,7 +1053,10 @@ sub parse_blob_diff_lines {

       $after_line_num = $next_after_line_num++;

       $add_line_count++;

     }

-    elsif ($line =~ /^Binary files/) { $class = 'binary_file' }

+    elsif ($line =~ /^Binary files/) {

+      $class = 'binary_file';

+      $diff_info->{binary} = 1;

+    }

     elsif ($line =~ /^ /) {

       $class = 'diff';

       $before_line_num = $next_before_line_num++;

@@ -1075,12 +1084,11 @@ sub parse_blob_diff_lines {

     ? 0

     : floor(($delete_line_count * 5) / $diff_line_count);

-  my $diff_info = {

-    add_line_count => $add_line_count,

-    delete_line_count => $delete_line_count,

-    add_block_count => $add_block_count,

-    delete_block_count => $delete_block_count

-  };

+  $diff_info->{add_line_count} = $add_line_count;

+  $diff_info->{delete_line_count} = $delete_line_count;

+  $diff_info->{add_block_count} = $add_block_count;

+  $diff_info->{delete_block_count} = $delete_block_count;

+  

   return (\@lines, $diff_info);

 }

@@ -27,7 +27,7 @@

 %>

-<<%= $tag %> title="<%= $diff_count_text %>" style="text-decoration:none;color:#666" href="#<%= $fragment %>"><%= $diff_line_count %></<%= $tag %>>

+<<%= $tag %> title="<%= $diff_count_text %>" style="text-decoration:none;color:#666" href="#<%= $fragment %>"><%= $diff_tree->{binary} ? 'BIN' : $diff_line_count %></<%= $tag %>>

 <<%= $tag %> title="<%= $diff_count_text %>" style="text-decoration:none;display:inline-block;overflow:none;" href="#<%= $fragment %>">

   % for (my $i = 0; $i < $add_block_count; $i++) {

@@ -120,9 +120,23 @@ note 'Commit page';

   note 'add text';

   {

     $t->get_ok("/$user/$project/commit/da5b854b760351adc58d24d121070e729e80534d");

+    $t->content_like(qr/\@\@/);

     $t->content_like(qr/\+aaa/);

   }

+  note 'added aaa to a_renamed.txt for merge commit';

+  {

+    $t->get_ok("/$user/$project/commit/da5b854b760351adc58d24d121070e729e80534d");

+    $t->content_like(qr/\@\@/);

+  }

+  

+  note 'add image data';

+  {

+    $t->get_ok("/$user/$project/commit/0b6eca6a28538b1226961ca7655d2662f3522652");

+    $t->content_like(qr/BIN/);

+    $t->content_like(qr#/raw/0b6eca6a28538b1226961ca7655d2662f3522652/sample.png#);

+  }

+  

   note 'Branch name';

   {

     # Page access (branch name)