| commit | d51c5274e458e9c2545144b6821978ccda85c117 | |
| author | Thomas Rast <trast@inf.ethz.ch> | |
| Fri, 12 Apr 2013 16:05:10 +0000 (12 18:05 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Apr 2013 18:34:37 +0000 (12 11:34 -0700) | ||
| tree | 1b14ee62ac69791c4ba1c54266d4621516e14923 | treesnapshot (tar.gz zip) |
| parent | 035ff3987bcbe93a823f47befbe019319c1484b0 | commitdiff |
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>
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>
| t/t4211-line-log.sh | diffblobblamehistory | |
| t/t4211/expect.parallel-change-f-to-main | [new file with mode: 0644] | blob |
| t/t4211/history.export | diffblobblamehistory |