1 The recentchanges page can currently display merge commits, such as "Merge
2 branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info".
4 It should filter these out somehow, but I'm not sure how to do that.
6 A merge in general is a commit with two parents, right? But such a merge
7 might be what gitweb calls a "simple merge", that is I think, just a
8 fast-forward. Or it could be a merge that includes manual conflict resolution,
9 and should be shown in recentchanges.