shithub: git9

Info  •  Files  •  Log  •  Branches

Change to root of repo before starting merge.

diff: cannot open b/test//null: file does not exist: 'b/test//null'

--- 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}