Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.
=======================
Should display 'First commit message'
description:
First commit message
=======================
Should display 'Second commit message'
description:
Second commit message
=======================
Should display 'Third commit message\n This is the 3rd log message'
description:
Third commit message
This is the 3rd log message
=======================
Should display 'Fifth commit message\n This is the 5th log message'
description:
Fifth commit message