delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	log -L: test merge of parallel modify/rename	Thomas Rast	2013-04-12	1	-0/+160
	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>