|
|
|
|
Index: lib/c-stack.c
|
|
|
|
|
--- lib/c-stack.c.orig 2011-08-28 13:55:52.000000000 +0200
|
|
|
|
|
+++ lib/c-stack.c 2012-05-12 10:06:32.000000000 +0200
|
|
|
|
|
@@ -35,6 +35,10 @@
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
+#if defined(__FreeBSD__)
|
|
|
|
|
+#include <sys/types.h>
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
#ifndef __attribute__
|
|
|
|
|
# if __GNUC__ < 3
|
|
|
|
|
# define __attribute__(x)
|
|
|
|
|
Index: man/diff3.1
|
|
|
|
|
--- man/diff3.1.orig 2011-09-02 17:19:12.000000000 +0200
|
|
|
|
|
+++ man/diff3.1 2012-05-12 10:06:32.000000000 +0200
|
|
|
|
|
@@ -39,6 +39,9 @@
|
|
|
|
|
\fB\-a\fR, \fB\-\-text\fR
|
|
|
|
|
treat all files as text
|
|
|
|
|
.TP
|
|
|
|
|
+\fB\-O\fR
|
|
|
|
|
+Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only)
|
|
|
|
|
+.TP
|
|
|
|
|
\fB\-\-strip\-trailing\-cr\fR
|
|
|
|
|
strip trailing carriage return on input
|
|
|
|
|
.TP
|
|
|
|
|
Index: src/diff3.c
|
|
|
|
|
--- src/diff3.c.orig 2011-07-03 22:42:54.000000000 +0200
|
|
|
|
|
+++ src/diff3.c 2012-05-12 10:06:32.000000000 +0200
|
|
|
|
|
@@ -158,6 +158,9 @@
|
|
|
|
|
/* If nonzero, show information for DIFF_2ND diffs. */
|
|
|
|
|
static bool show_2nd;
|
|
|
|
|
|
|
|
|
|
+/* If nonzero, show information for DIFF_2ND on overlaps, too. */
|
|
|
|
|
+static bool show_2nd_on_overlap;
|
|
|
|
|
+
|
|
|
|
|
/* If nonzero, include `:wq' at the end of the script
|
|
|
|
|
to write out the file being edited. */
|
|
|
|
|
static bool finalwrite;
|
|
|
|
|
@@ -237,7 +240,7 @@
|
|
|
|
|
textdomain (PACKAGE);
|
|
|
|
|
c_stack_action (0);
|
|
|
|
|
|
|
|
|
|
- while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1)
|
|
|
|
|
+ while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1)
|
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
@@ -272,6 +275,9 @@
|
|
|
|
|
case 'e':
|
|
|
|
|
incompat++;
|
|
|
|
|
break;
|
|
|
|
|
+ case 'O':
|
|
|
|
|
+ show_2nd_on_overlap = true;
|
|
|
|
|
+ break;
|
|
|
|
|
case 'T':
|
|
|
|
|
initial_tab = true;
|
|
|
|
|
break;
|
|
|
|
|
@@ -1547,7 +1553,7 @@
|
|
|
|
|
leading_dot = false;
|
|
|
|
|
if (type == DIFF_ALL)
|
|
|
|
|
{
|
|
|
|
|
- if (show_2nd)
|
|
|
|
|
+ if (show_2nd || show_2nd_on_overlap)
|
|
|
|
|
{
|
|
|
|
|
/* Append lines from FILE1. */
|
|
|
|
|
fprintf (outputfile, "||||||| %s\n", file1);
|
|
|
|
|
@@ -1686,7 +1692,7 @@
|
|
|
|
|
D_RELLEN (b, mapping[FILE0], i), outputfile);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (show_2nd)
|
|
|
|
|
+ if (show_2nd || show_2nd_on_overlap)
|
|
|
|
|
{
|
|
|
|
|
/* Put in lines from FILE1 with bracket. */
|
|
|
|
|
fprintf (outputfile, format_2nd, file1);
|
