log

age author description
Tue, 28 Jan 2020 21:49:50 -0800 Martin von Zweigbergk graphlog: use '%' for other context in merge conflict
Wed, 29 Jan 2020 14:42:54 -0800 Martin von Zweigbergk tests: add `hg log -G` output when there are merge conflicts
Wed, 29 Jan 2020 11:30:35 -0800 Martin von Zweigbergk revset: add a revset for parents in merge state
Fri, 10 Jan 2020 17:46:10 -0800 Martin von Zweigbergk tests: add test of rebase with conflict in merge commit