+ if file1_hash and not os.path.exists(path):
+ # the current file might be removed by GIT when it is a new
+ # file added in both branches. Just re-generate it
+ tmp = __output('git-unpack-file %s' % file1_hash)
+ os.chmod(tmp, int(file1_mode, 8))
+ os.renames(tmp, path)
+