Commit cfae7f85fbbc5b0e023e94f78486bf72cc1436f5

Edward Thomson 2013-08-09T20:23:36

Honor UPDATE_ONLY bit when checking out conflicts