aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3
diff options
context:
space:
mode:
authorTom Jones <thj@FreeBSD.org>2022-08-01 13:46:09 +0000
committerTom Jones <thj@FreeBSD.org>2022-08-01 13:53:53 +0000
commitca53a8445ab32987b118011c25c520eedf58881c (patch)
treea5b555c9e7f0e538416bd3041766ac84379bec4f /usr.bin/diff3
parent85d92faf434ac8b336d09dfbce5c324fa53c4bc1 (diff)
Diffstat (limited to 'usr.bin/diff3')
-rw-r--r--usr.bin/diff3/diff3.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index f3058e0d5c4e..7adb9b5c5043 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -144,6 +144,7 @@ static char *f1mark, *f2mark, *f3mark;
static const char *oldmark = "<<<<<<<";
static const char *orgmark = "|||||||";
static const char *newmark = ">>>>>>>";
+static const char *divider = "=======";
static bool duplicate(struct range *, struct range *);
static int edit(struct diff *, bool, int, int);
@@ -599,7 +600,7 @@ edscript(int n)
prange(&de[n].old, delete);
} else {
printf("%da\n", de[n].old.to - 1);
- printf("=======\n");
+ printf("%s\n", divider);
}
printrange(fp[2], &de[n].new);
if (!oflag || !overlap[n]) {
@@ -657,7 +658,7 @@ Ascript(int n)
printf("%s %s\n", oldmark, f2mark);
if (!deleteold)
printrange(fp[1], &de[n].old);
- printf("=======\n.\n");
+ printf("%s\n.\n", divider);
}
} else if (de[n].type == DIFF_TYPE3) {
@@ -676,7 +677,7 @@ Ascript(int n)
} else
printrange(fp[1], &de[n].old);
- printf("=======\n");
+ printf("%s\n", divider);
printrange(fp[2], &de[n].new);
}
@@ -724,7 +725,7 @@ mergescript(int i)
if (de[n].type == DIFF_TYPE2) {
printf("%s %s\n", oldmark, f2mark);
printrange(fp[1], &de[n].old);
- printf("=======\n");
+ printf("%s\n", divider);
printrange(fp[2], &de[n].new);
printf("%s %s\n", newmark, f3mark);
} else if (de[n].type == DIFF_TYPE3) {
@@ -744,7 +745,7 @@ mergescript(int i)
} else
printrange(fp[1], &de[n].old);
- printf("=======\n");
+ printf("%s\n", divider);
printrange(fp[2], &de[n].new);
printf("%s %s\n", newmark, f3mark);