Re: Incorrect merge

[Lars Magne Ingebrigtsen]

Stefan Monnier <address@hidden> writes:

> (or once we get rid of the ChangeLog files)

You probably hoped nobody would notice that parenthesis, but is getting
rid of the ChangeLog files in the cards?

1) They're a pain in the ass, both to write and due to the constant
merge conflicts.

2) But they give a better overview over what's happening, and who's
doing what, than any VC log I've seen.

-- 
(domestic pets only, the antidote for overdose, milk.)
  address@hidden * Lars Magne Ingebrigtsen