diff mercurial/merge.py @ 17651:3b49c28658f6

store: rename "openertype" argument to "vfstype"
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 31 Aug 2012 02:06:29 +0900
parents 98687cdddcb1
children ce7bc04d863b
line wrap: on
line diff