[PATCH 1 of 6 STABLE] keyword: suppress keyword expansion while 'hg unshelve' for internal merge

[Pierre-Yves David]

On 06/05/2014 12:52 AM, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1401954433 -32400
> #      Thu Jun 05 16:47:13 2014 +0900
> # Branch stable
> # Node ID 1232fc348f6f12466aa73ecca1100d272f74ac84
> # Parent  dedb68a9532cafde83ccafee1ef2c1e6b02ac189
> keyword: suppress keyword expansion while 'hg unshelve' for internal merge

I've pushed those 6 for stable. Thanks

(queued)

-- 
Pierre-Yves David