# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1383891221 -32400
# Node ID f064197f160df7814b1cde9653ebd946b1fa8833
# Parent  6ef30abe29f9fa874f07235a6e7de332b4f54fd4# Parent  347e3069087983e2c1f3c4f017be64da2510579d
Merge.

diff -r 6ef30abe29f9 -r f064197f160d rc/hgrc
--- a/rc/hgrc	Fri Nov 08 15:12:43 2013 +0900
+++ b/rc/hgrc	Fri Nov 08 15:13:41 2013 +0900
@@ -37,3 +37,5 @@
 
 [bookmarks]
 track.current = true
+
+%include ~/.hgrc.local
diff -r 6ef30abe29f9 -r f064197f160d setup
--- a/setup	Fri Nov 08 15:12:43 2013 +0900
+++ b/setup	Fri Nov 08 15:13:41 2013 +0900
@@ -137,6 +137,7 @@
     _rc "${1}" "gitconfig" ".gitconfig"
     _rc "${1}" "gitignore_global" ".gitignore_global"
     _rc "${1}" "hgrc" ".hgrc"
+    _touch "${HOME}/.hgrc.local"
     _rc "${1}" "hgignore_global" ".hgignore_global"
     _touch "${HOME}/.hgignore_global.local"
     _rc "${1}" "inputrc" ".inputrc"
@@ -154,4 +155,3 @@
     _help
   ;;
 esac
-