D8043: graphlog: use '%' for other context in merge conflict

2020-02-10 Thread martinvonz (Martin von Zweigbergk)
Closed by commit rHG14d0e89520a2: graphlog: use '%' for other context in merge conflict (authored by martinvonz). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8043?vs=20095&id=2013

D8043: graphlog: use '%' for other context in merge conflict

2020-02-10 Thread martinvonz (Martin von Zweigbergk)
Herald added a subscriber: mjpieters. martinvonz updated this revision to Diff 20095. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8043?vs=19870&id=20095 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8043/new/ REVISION DE

D8043: graphlog: use '%' for other context in merge conflict

2020-02-04 Thread martinvonz (Martin von Zweigbergk)
martinvonz updated this revision to Diff 19870. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8043?vs=19723&id=19870 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8043/new/ REVISION DETAIL https://phab.mercurial-scm.org/

D8043: graphlog: use '%' for other context in merge conflict

2020-01-30 Thread martinvonz (Martin von Zweigbergk)
martinvonz edited the summary of this revision. martinvonz retitled this revision from "graphlog: use '@' also for other context in merge conflict" to "graphlog: use '%' for other context in merge conflict". martinvonz updated this revision to Diff 19723. REPOSITORY rHG Mercurial CHANGES SINC