Remove the MAX_CHECK macro, it was initially used to test if a file was a
text file or not. The check is not done by diff3 but by diff (the argument -a is directly passed to diff(1))
This commit is contained in:
parent
e1910ebda4
commit
433115a0a4
@ -149,10 +149,8 @@ enum {
|
||||
STRIPCR_OPT,
|
||||
};
|
||||
|
||||
#define MAX_CHECK 768 /* 3 kb of chars */
|
||||
#define DIFF_PATH "/usr/bin/diff"
|
||||
|
||||
|
||||
#define OPTIONS "3aAeEiL:mTxX"
|
||||
static struct option longopts[] = {
|
||||
{ "ed", no_argument, NULL, 'e' },
|
||||
|
Loading…
x
Reference in New Issue
Block a user