comparison CONTRIBUTORS @ 21703:99f7e5fe35f2 stable

keyword: suppress keyword expansion while 'hg unshelve' for internal merge Before this patch, 'hg unshelve' may cause unexpected conflict, if 'hg unshelve'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg unshelve' for internal merge by adding 'unshelve' to 'restricted' command list like 'merge'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 05 Jun 2014 16:47:13 +0900
parents c29efd272395
children
comparison
equal deleted inserted replaced
21701:dedb68a9532c 21703:99f7e5fe35f2