diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:26:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:26:39 (GMT) |
| commit | 8cc3709df0e4f8e4f2aca6ae68b5b4f145787252 (patch) | |
| tree | c7fbbae471651cc02514a02f78676168e9415d0b /builtin-merge-ours.c | |
| parent | 868cfe09237430d9d24f17ce2f16c03d4c39b58a (diff) | |
| parent | 1caaf225f86b7b1818103e72774e191fb1f3d0bb (diff) | |
| download | git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.zip git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.tar.gz git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.tar.bz2 | |
Merge branch 'ld/maint-diff-quiet-w' into maint
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions