Fri, 10 Jan 2020 17:20:12 -0800 | Martin von Zweigbergk | rebase: remove some now-unused parent arguments | changeset | files |
Fri, 10 Jan 2020 21:40:01 -0800 | Martin von Zweigbergk | rebase: remove some redundant setting of dirstate parents | changeset | files |
Fri, 10 Jan 2020 14:22:20 -0800 | Martin von Zweigbergk | rebase: don't use rebased node as dirstate p2 (BC) | changeset | files |
Fri, 10 Jan 2020 14:17:56 -0800 | Martin von Zweigbergk | rebase: stop relying on having two parents to resume rebase | changeset | files |
Tue, 28 Jan 2020 21:49:50 -0800 | Martin von Zweigbergk | graphlog: use '%' for other context in merge conflict | changeset | files |
Wed, 29 Jan 2020 14:42:54 -0800 | Martin von Zweigbergk | tests: add `hg log -G` output when there are merge conflicts | changeset | files |