diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-12 12:27:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-12 13:25:18 -0800 |
| commit | 4d924528d8bfe947abfc54ee9bd3892ab509c8cd (patch) | |
| tree | 0274efc726cd0e9f27916b976c59a9aaf5380a1b /xdiff-interface.c | |
| parent | Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' (diff) | |
| download | tgif-4d924528d8bfe947abfc54ee9bd3892ab509c8cd.tar.xz | |
Revert "Merge branch 'ra/rebase-i-more-options'"
This reverts commit 5d9324e0f4210bb7d52bcb79efe3935703083f72, reversing
changes made to c58ae96fc4bb11916b62a96940bb70bb85ea5992.
The topic turns out to be too buggy for real use.
cf. <f2fe7437-8a48-3315-4d3f-8d51fe4bb8f1@gmail.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions