From 53bb0489356426c1db5610ab47c15845e6eb4a83 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 7 Sep 2016 19:45:47 -0500
Subject: [PATCH] Run paper upstream from anywhere

woops
---
 paper | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/paper b/paper
index 4d88796ee2..5d9f746a8b 100755
--- a/paper
+++ b/paper
@@ -75,7 +75,10 @@ case "$1" in
         cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
     ;;
     "u" | "up" | "upstream")
+    (
+        cd "$basedir"
         scripts/upstreamMerge.sh "$basedir" "$2"
+    )
     ;;
     "r" | "root")
         cd "$basedir"