# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1558448616 14400
# Node ID fccbc17efadf9c8fe3d9dc175a0d34e214b5c95b
# Parent  844194673385738032fef18ff7b2c3b845461757# Parent  8c524b57a91b83e9236327c2692e02ffcf0ea2da
Merge.

diff -r 8c524b57a91b -r fccbc17efadf fish/functions/epp.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/epp.fish	Tue May 21 10:23:36 2019 -0400
@@ -0,0 +1,14 @@
+function epp -d "Edit personal .plan"
+    switch (hostname)
+    case alephnull
+        cd ~/.personal-plan
+    case '*'
+        cd ~/.plan
+    end
+
+    hg pull -u
+    nvim README.markdown
+    hg ci -m 'Update'
+    hg pa
+    cd -
+end
diff -r 8c524b57a91b -r fccbc17efadf vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon May 20 19:38:38 2019 -0400
+++ b/vim/custom-dictionary.utf-8.add	Tue May 21 10:23:36 2019 -0400
@@ -284,3 +284,5 @@
 virtualization
 rebasing
 destructure
+upsert
+upserts