Mercurial > ec-dotfiles

changeset 490:f064197f160d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author edogawaconan <me@myconan.net>
date Fri, 08 Nov 2013 15:13:41 +0900
parents 6ef30abe29f9 (current diff) 347e30690879 (diff)
children c3c2353044ad
files rc/hgrc
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
-