log

age author description
Fri, 18 Dec 2015 18:32:15 +0000 timeless rebase: mention conflict in documentation instead of merge
Fri, 18 Dec 2015 18:31:45 +0000 timeless rebase: simplify documentation about heads