tlcacher: ignore merge info

1 files changed, 2 insertions, 2 deletions

diff --git a/timeline/tlcacher.php b/timeline/tlcacher.php
index 277eb7c..63340a0 100755
--- a/timeline/tlcacher.php
+++ b/timeline/tlcacher.php
@@ -19,8 +19,7 @@ $task_url="https://crux.nu/bugs/?do=details&id=%s";
 // Gitweb url for commits
 $git_url = "http://crux.nu/gitweb/?p=%s.git;a=commitdiff;h=%s";
 // append ":branch" to the repo name to restrict logs to 'branch'
-#$git_repos = array("ports/core:2.2","ports/opt:2.2","ports/xorg:2.2", "tools/pkgutils", "tools/prt-get", "tools/prt-utils");
-$git_repos = array("ports/core:2.2","ports/opt:2.2","tools/webtools");
+$git_repos = array("ports/core:2.2","ports/opt:2.2","tools/pkgutils", "tools/prt-get");
 $git_root = "/home/crux/scm";
 
 // Map git authors to wiki profiles
@@ -217,6 +216,7 @@ foreach ($git_repos as $repo) {
                 $url = sprintf($git_url, $repo, $rev);
                 $compact_rev = substr($rev,0,4)."..".substr($rev,-4,4);
                 $revurl = "[[$url|$compact_rev]]";
+            } else if (substr($line, 0, 7) == "Merge: ") {
             } else if (substr($line, 0, 8) == "Author: ") {
                 $user = substr($line, 8);
                 $pos = strpos($user, "<");