single-KEYWORDS-conflict « tests « merge_driver_ekeyword « gentoolkit « pym - proj/gentoolkit.git - Collection of administration scripts for Gentoo

GitWeb

Get Gentoo!

about summary refs log tree commit diff

path: root/pym/gentoolkit/merge_driver_ekeyword/tests/single-KEYWORDS-conflict

Mode	Name	Size
-rw-r--r--	A.ebuild	425	log plain
-rw-r--r--	B.ebuild	425	log plain
-rw-r--r--	common-ancestor.ebuild	426	log plain
-rw-r--r--	expected.ebuild	424	log plain