Date: Tue, 19 Apr 2022 14:40:33 GMT From: Tom Jones <thj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: df092859b478 - main - diff3: seperate old and new markers from file markers Message-ID: <202204191440.23JEeXfu088334@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=df092859b478d4776cbc6c120de5bf21e7543e30 commit df092859b478d4776cbc6c120de5bf21e7543e30 Author: Tom Jones <thj@FreeBSD.org> AuthorDate: 2022-04-19 14:38:30 +0000 Commit: Tom Jones <thj@FreeBSD.org> CommitDate: 2022-04-19 14:40:07 +0000 diff3: seperate old and new markers from file markers With -A and -m output the conflict markers are not tied to the file name. Seperate out these markers. Sponsored by: Klara, Inc. --- usr.bin/diff3/diff3.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 396b2620d22c..97fccc739ebe 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -128,6 +128,8 @@ static int Aflag, eflag, iflag, mflag, Tflag; static int oflag; /* indicates whether to mark overlaps (-E or -X) */ static int strip_cr; static char *f1mark, *f2mark, *f3mark; +static const char *oldmark = "<<<<<<<"; +static const char *newmark = ">>>>>>>"; static bool duplicate(struct range *, struct range *); static int edit(struct diff *, bool, int); @@ -561,8 +563,9 @@ edscript(int n) if (!delete) printf(".\n"); } else { - printf("%s\n.\n", f3mark); - printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark); + printf("%s %s\n.\n", newmark, f3mark); + printf("%da\n%s %s\n.\n", de[n].old.from - 1, + oldmark, f1mark); } } if (iflag) @@ -705,15 +708,15 @@ main(int argc, char **argv) file3 = argv[2]; if (oflag) { - asprintf(&f1mark, "<<<<<<< %s", + asprintf(&f1mark, "%s", labels[0] != NULL ? labels[0] : file1); if (f1mark == NULL) err(2, "asprintf"); - asprintf(&f2mark, "||||||| %s", + asprintf(&f2mark, "%s", labels[1] != NULL ? labels[1] : file2); if (f2mark == NULL) err(2, "asprintf"); - asprintf(&f3mark, ">>>>>>> %s", + asprintf(&f3mark, "%s", labels[2] != NULL ? labels[2] : file3); if (f3mark == NULL) err(2, "asprintf");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204191440.23JEeXfu088334>