At a minimum, what I'd like is to have "hg merge" open up the conflicting versions in side by side instances of, say, MS Paint (ugh), so I can do the merging manually. Bonus points for tool suggestions other than MS Paint. At the moment I'm looking at At a minimum, what I'd like is to have "hg merg
阅读背景：
在mercurial中处理图像（bmp，png，jpg等）文件合并冲突
来源：互联网
分享到：
