diff Makefile @ 21706:5c64c338fa9f stable

keyword: suppress keyword expansion while 'hg backout' for internal merge Before this patch, 'hg backout' may cause unexpected conflict, if 'hg backout'-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 backout' for internal merge by adding 'backout' to 'restricted' command list like 'merge'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 05 Jun 2014 16:47:14 +0900
parents 54d7657d7d1e
children 62a2749895e4
line wrap: on
line diff