diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
| commit | b604585914e032b28bef3e337a978e56a9069cda (patch) | |
| tree | b2ee0a3fb38d10397c602d0fe215ea3bbbf334c0 /editors/diff.c | |
| parent | 0eda07c7ff8cf1fc11bc1bda5383f884d7adf031 (diff) | |
| parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
| download | busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.gz busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.bz2 busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
| -rw-r--r-- | editors/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/diff.c b/editors/diff.c index 3a3334640..b08ded3a1 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -843,7 +843,7 @@ static void diffdir(char *p[2], const char *s_start) | |||
| 843 | * add_to_dirlist will remove it. */ | 843 | * add_to_dirlist will remove it. */ |
| 844 | list[i].len = strlen(p[i]); | 844 | list[i].len = strlen(p[i]); |
| 845 | recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, | 845 | recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, |
| 846 | add_to_dirlist, skip_dir, &list[i], 0); | 846 | add_to_dirlist, skip_dir, &list[i], 0); |
| 847 | /* Sort dl alphabetically. | 847 | /* Sort dl alphabetically. |
| 848 | * GNU diff does this ignoring any number of trailing dots. | 848 | * GNU diff does this ignoring any number of trailing dots. |
| 849 | * We don't, so for us dotted files almost always are | 849 | * We don't, so for us dotted files almost always are |