aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* qlop: don't "forget" merges when a parallel merge finishesFabian Groffen2019-10-201-0/+53