##// END OF EJS Templates
resolve: do not crash on empty mergestate...
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.

File last commit:

r9999:f91e5630 default
r11451:51021f4c stable
Show More
coal-folder.png
0 lines | 284 B | image/png | TextLexer
/ mercurial / templates / static / coal-folder.png
rendered-image