Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 26608:ae5b60d3294f
age | author | description |
---|---|---|
Thu, 08 Oct 2015 00:19:20 -0700 | Siddharth Agarwal | filemerge: deindent the parts of filemerge outside the try block |
Sun, 11 Oct 2015 20:47:04 -0700 | Siddharth Agarwal | filemerge: introduce a premerge flag and function |
Sun, 11 Oct 2015 12:56:21 -0700 | Siddharth Agarwal | filemerge: also return whether the merge is complete |