* detect conflicts explicitly
authoragriffis <agriffis@gentoo.org>
Tue, 26 Apr 2005 21:08:59 +0000 (21:08 -0000)
committeragriffis <agriffis@gentoo.org>
Tue, 26 Apr 2005 21:08:59 +0000 (21:08 -0000)
commit6cedb5747ecceddabf10627e96abb5c20d1dc78f
tree7930c17767d070ef649b2abf74fd2cff10c183e0
parent1b3ce99de8f2fd6113455e2ffb664aa6dc628d46
* detect conflicts explicitly
* report ChangeLog in the list of files if it's the only file
  that is changing #90326

svn path=/; revision=209
trunk/src/echangelog/ChangeLog
trunk/src/echangelog/echangelog