Jujutsu currently has support for neither of these two commands, however it has something that comes really close to what I want to achieve with potentially less friction than Git: jj diffedit. This command lets you edit the contents of a single change. However, the builtin editor only lets you pick which lines to keep or discard, with no way to otherwise change or rearrange their contents, and external merge tools like KDiff3 (admittedly, the only one I tried), don’t really work well for this purpose.
Фото: Global Look Press
。业内人士推荐wps作为进阶阅读
Фото: Alina Smutko / Reuters，更多细节参见手游
Фон дер Ляйен оценила идею вернуться к российскому топливу14:54