projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 87863ef) | patch
Resolve conflict.
authorFabian Groffen <grobian@gentoo.org>
Wed, 14 Dec 2011 15:27:58 +0000 (16:27 +0100)
committerFabian Groffen <grobian@gentoo.org>
Wed, 14 Dec 2011 15:27:58 +0000 (16:27 +0100)
commit1fd41e665b7c1c404eaf67d981e701d90817f784
tree903091f27efd54d966840a4bc603b9c0538284dctree | snapshot
parent87863efd98a474f01af099609903cbf7e7a3754dcommit | diff
Resolve conflict.

Long ago, VCSs would warn when you would want to commit conflict
markers.
pym/portage/data.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.