summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-05-28 05:42:14 -0700
committerJunio C Hamano <gitster@pobox.com>2019-05-28 13:22:32 -0700
commitdb4a3f26c373fd73688991fbeb76b2d00b9a470c (patch)
tree1787f9abed34e43cb6727779c33c4ed88a975c81 /diff.c
parent427c3bd28ab504443d0eea6fc6aa27b0c0748372 (diff)
tests: mark a couple more test cases as requiring `rebase -p`
The `--preserve-merges` option has been deprecated, and as a consequence we started to mark test cases that require that option to be supported, in preparation for removing that support eventually. Since we marked those test cases, a couple more crept into the test suite, and with this patch, we mark them, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions