Mercurial - see list of files that need to be manually merged?

前端 未结 4 2349
遥遥无期
遥遥无期 2021-02-18 13:21

Is there a Mercurial command you can use after an hg pull to see a list of all files that will be need to be manually merged (ie: that have conflicts) when doing an

4条回答
  •  眼角桃花
    2021-02-18 14:19

    I think hg status is what you are looking for.

    You may want to read this chapter from Mercurial: The Definitive Guide

    http://hgbook.red-bean.com/read/mercurial-in-daily-use.html

提交回复
热议问题