[PATCH STABLE] shelve: use rebase instead of merge (issue4068)

[Matt Mackall]

On Fri, 2013-10-25 at 11:59 -0700, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1382559168 25200
> #      Wed Oct 23 13:12:48 2013 -0700
> # Branch stable
> # Node ID ff91f2972263c857ef017bd72a195ce0cbe54e6d
> # Parent  d51c4d85ec23a67292f07b3121a9353452364f6d
> shelve: use rebase instead of merge (issue4068)

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.