# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1477618574 18000
# Node ID cae546f293ff9018a1540a1b5f0d14126974045a
# Parent  aa1019ab89b43421df7e225c0d0154f86a801fad# Parent  d17e9bd25f685e080c93f58ab381da408736e18d
Merge

diff -r d17e9bd25f68 -r cae546f293ff hg/.hgrc
--- a/hg/.hgrc	Thu Oct 29 21:14:25 2015 -0500
+++ b/hg/.hgrc	Thu Oct 27 20:36:14 2016 -0500
@@ -11,6 +11,7 @@
 hgext.convert =
 pager =
 progress =
+shelve =
 
 [extdiff]
 cmd.kdiff3 =