git: 9front

Info  •  Files  •  Log  •  Branches

hgfs: use merge3

--- a/sys/src/cmd/hgfs/hgdb.c

+++ b/sys/src/cmd/hgfs/hgdb.c

@@ -230,7 +230,7 @@

 			else if(ld->qid.type & QTDIR)

 				print("# conflict # rm -r %s\n", lp);

 			else

-				print("# conflict # ape/diff3 %s %s %s >%s\n", lp, ap, rp, lp);

+				print("# conflict # merge3 %s %s %s >%s\n", lp, ap, rp, lp);

 		}

 	}

 	else if(strcmp(state, "md!") == 0){

-- 

⑨