diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:47 -0700 |
| commit | 50d3062ab2cea4e999b8f3bafd211ff348bca600 (patch) | |
| tree | 26cfdd46c59963b0301bd57d492a73f0abadbb5f /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'jc/rename-degrade-cc-to-c' (diff) | |
| parent | git diff -D: omit the preimage of deletes (diff) | |
| download | tgif-50d3062ab2cea4e999b8f3bafd211ff348bca600.tar.xz | |
Merge branch 'jc/diff-irreversible-delete'
* jc/diff-irreversible-delete:
git diff -D: omit the preimage of deletes
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions