Ignore git backup merge files
Ignore git backup merge files

*.orig can be ignored since they are git backup merge files.

Change-Id: I136f7ee27173360660d10ad572b8058119bf6ef0

redhat-openstack/manila,vponomaryov/manila,scality/manila,scality/manila,NetApp/manila,bswartz/manila,vponomaryov/manila,NetApp/manila,openstack/manila,jcsp/manila,jcsp/manila,openstack/manila,bswartz/manila,redhat-openstack/manila