Remove uncontested renamed files during merge.

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 61e2ab290036fe504b808ef35340ce776bd1983b..5ea3fda540f00e4b7ee2c11c380eac86168eca17 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -120,7 +120,7 @@
        # To disable system wide have in $GITWEB_CONFIG
        # $feature{'snapshot'}{'default'} = [undef];
        # To have project specific config enable override in $GITWEB_CONFIG
-       # $feature{'blame'}{'override'} = 1;
+       # $feature{'snapshot'}{'override'} = 1;
        # and in project config gitweb.snapshot = none|gzip|bzip2;
        'snapshot' => {
                'sub' => \&feature_snapshot,