hadley/ggplot2 — pull request #913 by krlmlr (2014-02-25 14:10:29+00:00)
Title: Avoid merge conflicts in NEWS file

by using the `union` merge strategy.

This will simplify life for contributors. Unfortunately, GitHub does not seem to support this for browser-based merging, but merges on the command line will not suffer from merge conflicts in `NEWS` anymore.

See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.