summaryrefslogtreecommitdiff
path: root/line-log.h
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-04-12 18:05:10 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-12 11:34:37 -0700
commitd51c5274e458e9c2545144b6821978ccda85c117 (patch)
tree1b14ee62ac69791c4ba1c54266d4621516e14923 /line-log.h
parent035ff3987bcbe93a823f47befbe019319c1484b0 (diff)
downloadgit-d51c5274e458e9c2545144b6821978ccda85c117.tar.gz
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>
Diffstat (limited to 'line-log.h')
0 files changed, 0 insertions, 0 deletions