Ignore .orig files, which result from merge conflicts. TRAC #23158 Signed-off-by: Nicolas Capens Authored-by: Jamie Madill
2013-06-13T10:25:23