![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 26 Dec 2009 22:03:18 +0000 (14:03 -0800) | ||
| commit | 3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 | |
| tree | efdba423f81c7c1a5c1e625a626d361a73165020 | tree | snapshot |
| parent | 7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d | commit | diff |
| parent | 97bf2a08095197f43b20b3bc1124552ae24d71bf | commit | diff |
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
* jc/1.7.0-diff-whitespace-only-status:
diff.c: fix typoes in comments
Make test case number unique
diff: Rename QUIET internal option to QUICK
diff: change semantics of "ignore whitespace" options
Conflicts:
diff.h
* jc/1.7.0-diff-whitespace-only-status:
diff.c: fix typoes in comments
Make test case number unique
diff: Rename QUIET internal option to QUICK
diff: change semantics of "ignore whitespace" options
Conflicts:
diff.h
| builtin-log.c | diff1 | | diff2 | | blob | history |
| builtin-rev-list.c | diff1 | | diff2 | | blob | history |
| diff-lib.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| diff.h | diff1 | | diff2 | | blob | history |
| revision.c | diff1 | | diff2 | | blob | history |