git-commit-vandalism/t/t4211
Thomas Rast d51c5274e4 log -L: test merge of parallel modify/rename
This tests a toy example of a history like

  * Merge
  | \
  |  * Modify foo
  |  |
  *  | Rename foo->bar
  | /
  * Create foo

Current log -L fails on this; we'll fix it in the next commit.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-12 11:34:37 -07:00
..
expect.beginning-of-file
expect.end-of-file
expect.move-support-f t4211: pass -M to 'git log -M -L...' test 2013-04-12 11:34:12 -07:00
expect.multiple log -L: fix overlapping input ranges 2013-04-05 10:39:09 -07:00
expect.multiple-overlapping log -L: fix overlapping input ranges 2013-04-05 10:39:09 -07:00
expect.multiple-superset log -L: fix overlapping input ranges 2013-04-05 10:39:09 -07:00
expect.parallel-change-f-to-main log -L: test merge of parallel modify/rename 2013-04-12 11:34:37 -07:00
expect.simple-f
expect.simple-f-to-main
expect.simple-main
expect.simple-main-to-end
expect.two-ranges
expect.vanishes-early
history.export log -L: test merge of parallel modify/rename 2013-04-12 11:34:37 -07:00