git-cola 1.4.0 crash with merge conflicts

[jacksonje]

Trying to open git-cola 1.4.0 in a repository that has merge conflicts results in a crash with:

Traceback (most recent call last):
File "/usr/bin/cola", line 54, in
cola.main.main()
File "/usr/share/git-cola/lib/cola/main.py", line 176, in main
model.update_status()
File "/usr/share/git-cola/lib/cola/models/main.py", line 468, in update_status
self.notify_message_observers(self.message_updated)
File "/usr/share/git-cola/lib/cola/observable.py", line 43, in notify_message_observers
method(_args, *_opts)
File "/usr/share/git-cola/lib/cola/views/main.py", line 205, in _update_view
merge_msg_hash = utils.checksum(merge_message_path)
NameError: global name 'merge_message_path' is not defined

[davvid]

views.main: Fix a typo when loading merge commit messages

self.merge_message_hash was mistyped as self.merge_msg_hash.

Closed by 93aeb038bcdff0d091b577d9a98df70c1e533917

Signed-off-by: David Aguilar davvid@gmail.com