Mercurial > hg
diff mercurial/merge.py @ 25828:5ae4b128a291
transplant: mark some undocumented options deprecated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jun 2015 17:42:09 -0500 |
parents | 19cc443aac34 |
children | bf9ea348b487 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jun 2015 17:42:09 -0500 |
parents | 19cc443aac34 |
children | bf9ea348b487 |