dredzone/moss — pull request #2 by kceb1987 (2012-10-07 18:01:19+00:00)
Title: Testing Merging A Files That is Different From One That Already Exists 

How Does This Work? Can you either keep all lines or delete the old ones? Do they give you a choice on which lines to keep from each version?