Searched refs:newmark (Results 1 – 1 of 1) sorted by relevance
| /freebsd/usr.bin/diff3/ |
| H A D | diff3.c | 136 static const char *newmark = ">>>>>>>"; variable
689 printf("%s %s\n.\n", newmark, f3mark); in edscript()
730 printf("%s %s\n", newmark, f3mark); in Ascript()
768 printf("%s %s\n.\n", newmark, f3mark); in Ascript()
830 printf("%s %s\n", newmark, f3mark); in mergescript()
855 printf("%s %s\n", newmark, f3mark); in mergescript()
|