changeset 28:cae546f293ff

Merge
author Brian Neal <bgneal@gmail.com>
date Thu, 27 Oct 2016 20:36:14 -0500
parents aa1019ab89b4 (diff) d17e9bd25f68 (current diff)
children c6c54a36f6a7
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 =