mergetool: don't skip modify/remove conflicts

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 47796180d2340ead3795ee7004ddae57d5bc1516..c65af1a00a42dccda70ddbc0f3231ae1b7a53644 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -7169,7 +7169,7 @@ sub git_feed {
                if (defined $favicon) {
                        print "<icon>" . esc_url($favicon) . "</icon>\n";
                }
-               if (defined $logo_url) {
+               if (defined $logo) {
                        # not twice as wide as tall: 72 x 27 pixels
                        print "<logo>" . esc_url($logo) . "</logo>\n";
                }