![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Mar 2009 21:30:51 +0000 (14:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Mar 2009 21:30:51 +0000 (14:30 -0700) | ||
| commit | de2e3b04cd70a22016561547530f980c66807641 | |
| tree | fc842c0e91cff12f3c84f3da0f85042d937ec19e | tree | snapshot |
| parent | 5645b021177d000bc8b2971aa73b82b62413ee20 | commit | diff |
| parent | 2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd | commit | diff |
Merge branch 'mv/parseopt-ls-files'
* mv/parseopt-ls-files:
ls-files: fix broken --no-empty-directory
t3000: use test_cmp instead of diff
parse-opt: migrate builtin-ls-files.
Turn the flags in struct dir_struct into a single variable
Conflicts:
builtin-ls-files.c
t/t3000-ls-files-others.sh
* mv/parseopt-ls-files:
ls-files: fix broken --no-empty-directory
t3000: use test_cmp instead of diff
parse-opt: migrate builtin-ls-files.
Turn the flags in struct dir_struct into a single variable
Conflicts:
builtin-ls-files.c
t/t3000-ls-files-others.sh
| builtin-add.c | diff1 | | diff2 | | blob | history |
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| builtin-ls-files.c | diff1 | | diff2 | | blob | history |
| dir.c | diff1 | | diff2 | | blob | history |
| wt-status.c | diff1 | | diff2 | | blob | history |