Fri, 21 Jan 2022 13:48:18 -0800 histedit: attempt to make merge labels more helpful
Martin von Zweigbergk <martinvonz@google.com> [Fri, 21 Jan 2022 13:48:18 -0800] rev 48591
histedit: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12023
Tue, 18 Jan 2022 13:23:49 -0800 update: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com> [Tue, 18 Jan 2022 13:23:49 -0800] rev 48590
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
Tue, 18 Jan 2022 15:04:55 -0800 merge: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com> [Tue, 18 Jan 2022 15:04:55 -0800] rev 48589
merge: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12021
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 tip