Mercurial > hg
graph
-
rebase: remove some now-unused parent argumentsFri, 10 Jan 2020 17:20:12 -0800, by Martin von Zweigbergk
-
rebase: remove some redundant setting of dirstate parentsFri, 10 Jan 2020 21:40:01 -0800, by Martin von Zweigbergk
-
rebase: don't use rebased node as dirstate p2 (BC)Fri, 10 Jan 2020 14:22:20 -0800, by Martin von Zweigbergk
-
rebase: stop relying on having two parents to resume rebaseFri, 10 Jan 2020 14:17:56 -0800, by Martin von Zweigbergk
-
graphlog: use '%' for other context in merge conflictTue, 28 Jan 2020 21:49:50 -0800, by Martin von Zweigbergk
-
tests: add `hg log -G` output when there are merge conflictsWed, 29 Jan 2020 14:42:54 -0800, by Martin von Zweigbergk
-
revset: add a revset for parents in merge stateWed, 29 Jan 2020 11:30:35 -0800, by Martin von Zweigbergk
-
tests: add test of rebase with conflict in merge commitFri, 10 Jan 2020 17:46:10 -0800, by Martin von Zweigbergk