diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 14:03:18 -0800 |
| commit | 3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 (patch) | |
| tree | efdba423f81c7c1a5c1e625a626d361a73165020 /t/t1001-read-tree-m-2way.sh | |
| parent | Merge branch 'jc/1.7.0-push-safety' (diff) | |
| parent | diff.c: fix typoes in comments (diff) | |
| download | tgif-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.tar.xz | |
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
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
0 files changed, 0 insertions, 0 deletions