diff .hgsubstate @ 393:8bf3eed26496

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 22 Aug 2017 13:11:51 -0700
parents 92ffe08255e2 92ae7310bb1b
children e9b3a01a14d2
line wrap: on
line diff
--- a/.hgsubstate	Tue Aug 22 13:08:15 2017 -0700
+++ b/.hgsubstate	Tue Aug 22 13:11:51 2017 -0700
@@ -1,10 +1,11 @@
 5c5203cc2a62a65eea3bce3931a8e41938341bcd lib/fish/virtualfish
 772d75b1a0309b89b96c4ad1c0b2f284104de974 lib/hg/allpaths
-fec6e12dedd8811869d1bb520cd26ce43cfd28ef lib/hg/hg-git
+871944d0db5cc714bfee2bd6087c380d3ef6a96f lib/hg/fast-hg-prompt
+4d63f2eb60fd6399d5f50d4703d8ced8132ce359 lib/hg/hg-git
 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync
 5334581e231a5167d03689ff47b3a6fdf082011c lib/hg/hg-prompt
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 lib/hg/mercurial-cli-templates
-e723a35599f3636cb060cefc5ebb79788ce1c7dc lib/hg/mutable-history
+21f06d9322316c9cc17eaebf5d4f40b9f24304f6 lib/hg/mutable-history
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 8e91a585024cdf2d14adaf548c21799edce0d6c0 lib/hg/path-pattern
 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status