# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1311345110 14400
# Node ID 8122243b81daf0784bdef79edc7bce6e47d834fc
# Parent  dbda09a7516048ae5769e3d951e7487d162ce5f3
More.

diff -r dbda09a75160 -r 8122243b81da .ackrc
--- a/.ackrc	Fri Jul 15 10:04:21 2011 -0400
+++ b/.ackrc	Fri Jul 22 10:31:50 2011 -0400
@@ -8,4 +8,8 @@
 --type-set
 vim=.vim
 --type-set
-front=.html,.js,.less,.css
+fe=.html,.js,.less
+--type-set
+fea=.html,.js,.less,.css
+--ignore-dir=public/media/cache
+--ignore-dir=public/static/cache
diff -r dbda09a75160 -r 8122243b81da .hgrc
--- a/.hgrc	Fri Jul 15 10:04:21 2011 -0400
+++ b/.hgrc	Fri Jul 22 10:31:50 2011 -0400
@@ -224,6 +224,9 @@
 subs  = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs    -n1  -I SUB $HG -R "`$HG root`/SUB" $@
 psubs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB $HG -R "`$HG root`/SUB" $@
 
+subscmd  = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs    -n1  -I SUB sh -c "cd `$HG root`/SUB && $@"
+psubscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB sh -c "cd `$HG root`/SUB && $@"
+
 # Run a command on a subrepo:
 #
 #     hg sub SUBREPO_REGEX ...command and arguments...
@@ -240,3 +243,5 @@
 #     $ hg sub ar status -m
 #     M lol.py
 sub = !grep = "`$HG root`/.hgsub" | cut -d' ' -f1 | grep "$1" | tr -d '\n ' | xargs -0 -I SUB $HG -R SUB $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20
+
+md = merge default
diff -r dbda09a75160 -r 8122243b81da vim/.vimrc
--- a/vim/.vimrc	Fri Jul 15 10:04:21 2011 -0400
+++ b/vim/.vimrc	Fri Jul 22 10:31:50 2011 -0400
@@ -690,12 +690,12 @@
 
 let g:threesome_initial_mode = "grid"
 
-let g:threesome_initial_layout_grid = 0
+let g:threesome_initial_layout_grid = 1
 let g:threesome_initial_layout_loupe = 0
 let g:threesome_initial_layout_compare = 0
 let g:threesome_initial_layout_path = 0
 
-let g:threesome_initial_diff_grid = 0
+let g:threesome_initial_diff_grid = 1
 let g:threesome_initial_diff_loupe = 0
 let g:threesome_initial_diff_compare = 0
 let g:threesome_initial_diff_path = 0