Show More
@@ -366,8 +366,11 b' class mergestate(object):' | |||||
366 |
|
366 | |||
367 | note: also write the local version to the `.hg/merge` directory. |
|
367 | note: also write the local version to the `.hg/merge` directory. | |
368 | """ |
|
368 | """ | |
369 | hash = util.sha1(fcl.path()).hexdigest() |
|
369 | if fcl.isabsent(): | |
370 | self._repo.vfs.write('merge/' + hash, fcl.data()) |
|
370 | hash = nullhex | |
|
371 | else: | |||
|
372 | hash = util.sha1(fcl.path()).hexdigest() | |||
|
373 | self._repo.vfs.write('merge/' + hash, fcl.data()) | |||
371 | self._state[fd] = ['u', hash, fcl.path(), |
|
374 | self._state[fd] = ['u', hash, fcl.path(), | |
372 | fca.path(), hex(fca.filenode()), |
|
375 | fca.path(), hex(fca.filenode()), | |
373 | fco.path(), hex(fco.filenode()), |
|
376 | fco.path(), hex(fco.filenode()), |
General Comments 0
You need to be logged in to leave comments.
Login now