cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hgfs: use merge3

Browse source
This commit is contained in:
Ori Bernstein 2024-07-30 17:12:03 +00:00
parent 2dc68de342
commit 2a47e4f086
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/hgfs/hgdb.c
View file

@ -230,7 +230,7 @@ apply(char *state, char *name, char *lp, char *rp, char *ap, Workdir *)
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){