resolve: do not crash on empty mergestate
I managed to get an empty .hg/merge/state file by interrupting a merge
by pressing Control-C. This lead to this error:
TypeError: a2b_hex() argument 1 must be string or read-only buffer,
not None
since localnode is assigned None before the iteration over lines in
the mergestate begins.
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 3:AD 1d4e82ed3c2a
|
| o 2:C 7e1afe9214b2
| |
| o 1:B 0a6620c3c26a
|/
o 0:A 1e635d440a73
@ 3:C 0c5887756284
|
o 2:B 4f208f4a1507
|
o 1:AD 1d4e82ed3c2a
|
o 0:A 1e635d440a73