ref: 4748f215582e6af9a8cab49a597b3b9c7ccce5a9
parent: 6888b49d4ee35b2adb09679b784f56174b18af58
author: Ori Bernstein <ori@eigenstate.org>
date: Fri Aug 9 01:33:37 EDT 2019
Change to root of repo before starting merge.
--- a/merge
+++ b/merge
@@ -28,7 +28,10 @@
if(! ~ $#* 1)
usage
-
+if(! cd `{git/conf -r}){+ echo 'not in git repository'
+ exit 'badrepo'
+}
git/fs
theirs=`{git/query $1} ours=`{git/query HEAD}