diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
| commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
| tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /editors/diff.c | |
| parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip | |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'editors/diff.c')
| -rw-r--r-- | editors/diff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/editors/diff.c b/editors/diff.c index 8b1e92783..8c0a31f47 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | //usage:#define diff_full_usage "\n\n" | 81 | //usage:#define diff_full_usage "\n\n" |
| 82 | //usage: "Compare files line by line and output the differences between them.\n" | 82 | //usage: "Compare files line by line and output the differences between them.\n" |
| 83 | //usage: "This implementation supports unified diffs only.\n" | 83 | //usage: "This implementation supports unified diffs only.\n" |
| 84 | //usage: "\nOptions:" | ||
| 85 | //usage: "\n -a Treat all files as text" | 84 | //usage: "\n -a Treat all files as text" |
| 86 | //usage: "\n -b Ignore changes in the amount of whitespace" | 85 | //usage: "\n -b Ignore changes in the amount of whitespace" |
| 87 | //usage: "\n -B Ignore changes whose lines are all blank" | 86 | //usage: "\n -B Ignore changes whose lines are all blank" |