# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1502340036 25200
# Node ID 92ae7310bb1bb2aa6657702aeea9421861e3be1e
# Parent  ff48d206d1f1fa27778ccc945ef429450b5ebec2# Parent  bcf2b6fc47926c3213f4d041f2c40fb5ebb35f28
Merge changes.

diff -r ff48d206d1f1 -r 92ae7310bb1b .hgsub
--- a/.hgsub	Sat Aug 05 22:11:13 2017 -0700
+++ b/.hgsub	Wed Aug 09 21:40:36 2017 -0700
@@ -48,6 +48,7 @@
 lib/hg/allpaths = https://bitbucket.org/ludovicchabant/allpaths
 lib/hg/mercurial-cli-templates = https://bitbucket.org/sjl/mercurial-cli-templates
 lib/hg/hg-prompt = https://bitbucket.org/sjl/hg-prompt
+lib/hg/fast-hg-prompt = https://bitbucket.org/ludovicchabant/fast-hg-prompt
 lib/hg/mutable-history = https://www.mercurial-scm.org/repo/evolve
 lib/hg/terse-status = https://bitbucket.org/durin42/terse-status
 lib/hg/path-pattern = https://bitbucket.org/Mekk/mercurial-path_pattern
diff -r ff48d206d1f1 -r 92ae7310bb1b .hgsubstate
--- a/.hgsubstate	Sat Aug 05 22:11:13 2017 -0700
+++ b/.hgsubstate	Wed Aug 09 21:40:36 2017 -0700
@@ -1,5 +1,6 @@
 80a44033b7facf069ddb734fb4e908a95e681b6c lib/fish/virtualfish
 03cc0603800e39d4c73ab965aca7f306e80ca8e1 lib/hg/allpaths
+871944d0db5cc714bfee2bd6087c380d3ef6a96f lib/hg/fast-hg-prompt
 4d63f2eb60fd6399d5f50d4703d8ced8132ce359 lib/hg/hg-git
 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync
 5334581e231a5167d03689ff47b3a6fdf082011c lib/hg/hg-prompt
diff -r ff48d206d1f1 -r 92ae7310bb1b tmux/tmux.conf
--- a/tmux/tmux.conf	Sat Aug 05 22:11:13 2017 -0700
+++ b/tmux/tmux.conf	Wed Aug 09 21:40:36 2017 -0700
@@ -12,5 +12,5 @@
 #set-option -g status-interval 1
 
 # Default to fish
-set -g default-command "/usr/local/bin/fish"
+set -g default-command "fish"