![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 07:07:32 +0000 (23:07 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 07:07:32 +0000 (23:07 -0800) |
* jk/maint-1.6.3-ls-files-i:
ls-files: unbreak "ls-files -i"
ls-files: unbreak "ls-files -i"
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-ls-files.txt | patch | | diff1 | | diff2 | | blob | history |
| builtin-ls-files.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-ls-files.txt
Simple merge
diff --cc builtin-ls-files.c
Simple merge