Viewing all changes in revision 405.
- Committer: John Arbash Meinel
- Date: 2010-02-03 22:16:55 UTC
- Revision ID: john@arbash-meinel.com-20100203221655-k9qs8haex62neoci
Simplify the conflict logic slightly.
- files modified:
- merge_changelog.py
expand all
collapse all
added
removed
