Mercurial 运行`hg histedit'时如何在命令行上指示合并工具`

运行

hg histedit

时，如何在命令行上指示合并工具？它似乎不支持

--tool

标志，比如

hgmerge

和

hgrebase

do

诺霍

Histedit不会以hg术语合并，而是将顺序更改合并为一个（如果折叠后需要）

试想一下这样的回购历史

>hg log --style compact
7[tip]   dd4d044125d6   2020-09-23 18:58 +0500   lazybadger
  Renaming

6   1c11e58879be   2020-09-23 18:56 +0500   lazybadger
  Expanding b

5   4eecc2e00de0   2020-09-23 18:54 +0500   lazybadger
  Fix casing in a

4   c4fb7f8f9d6a   2020-09-23 18:53 +0500   lazybadger
  End of replacing nums by words in a

3   f153e48d474b   2020-09-23 18:53 +0500   lazybadger
  Start of replacing nums by words in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

我想从中得到更多“干净的历史”

步骤1

加入r3和r4-

hg histedit f153

mess f153e48d474b 3 Replacing nums by words in a
fold c4fb7f8f9d6a 4 End of replacing nums by words in a
pick 4eecc2e00de0 5 Fix casing in a
pick 1c11e58879be 6 Expanding b
pick dd4d044125d6 7 Renaming

结果

>hg log --style compact
6[tip]   4cc2af840d4c   2020-09-23 18:58 +0500   lazybadger
  Renaming

5   ad1f49e75863   2020-09-23 18:56 +0500   lazybadger
  Expanding b

4   6a1e1cfb767a   2020-09-23 18:54 +0500   lazybadger
  Fix casing in a

3   089e21dda924   2020-09-23 18:53 +0500   lazybadger
  Replacing nums by words in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

>hg log --style compact
5[tip]   6c9516e6159f   2020-09-23 18:58 +0500   lazybadger
  Renaming files to correct langs

4   dfb843cc3841   2020-09-23 18:56 +0500   lazybadger
  Expanding b

3   ff58feffa9a5   2020-09-23 18:53 +0500   lazybadger
  Replacing nums and proper casing in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

聚合差异（抱歉俄罗斯日期，我懒得更改）

步骤2

如果我现在想加入（新）3和4，我会用同样的方法

mess 089e21dda924 3 Replacing nums by words in a
roll 6a1e1cfb767a 4 Fix casing in a
pick ad1f49e75863 5 Expanding b
mess 4cc2af840d4c 6 Renaming

结果

>hg log --style compact
6[tip]   4cc2af840d4c   2020-09-23 18:58 +0500   lazybadger
  Renaming

5   ad1f49e75863   2020-09-23 18:56 +0500   lazybadger
  Expanding b

4   6a1e1cfb767a   2020-09-23 18:54 +0500   lazybadger
  Fix casing in a

3   089e21dda924   2020-09-23 18:53 +0500   lazybadger
  Replacing nums by words in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

>hg log --style compact
5[tip]   6c9516e6159f   2020-09-23 18:58 +0500   lazybadger
  Renaming files to correct langs

4   dfb843cc3841   2020-09-23 18:56 +0500   lazybadger
  Expanding b

3   ff58feffa9a5   2020-09-23 18:53 +0500   lazybadger
  Replacing nums and proper casing in a

2   020cf4853caf   2020-09-23 18:50 +0500   lazybadger
  Added file b

1   1cbe55623ca6   2020-09-23 18:48 +0500   lazybadger
  Added string to a

0   2248df06d3de   2020-09-23 18:47 +0500   lazybadger
  initial commit

---

进程中没有合并，因为我有I个源，一组更改，而不是两个具有不同历史记录的源

一些处理合并冲突的命令似乎没有--tool选项。我们可能应该解决这个问题

同时，您可以使用

--config ui.merge=studgeeks\u preferred\u merge\u tool

作为任何命令的全局选项，以使用您可能喜欢的任何合并工具