Can not un-check the menu item "Abort Merge" in Settings dialog

By @YueLinHo on December 14, 2013 01:23 (imported from Google Code)

---

What steps will reproduce the problem?

1. open Settings dialog.
2. click on Context Menu node.
3. un-check the item "Abort Merge". (it was checked someday.)
4. push OK to leave.
5. open Settings again.

What is the expected output? What do you see instead?

Expected:
"Abort Merge" should be un-checked.
Instead:
"Abort Merge" is still checked.

What version of TortoiseGit and msysgit are you using? On
what operating system?

TGit 1.8.6.6
msysGit 1.8.4
Win7 64

Please provide any additional information below.

Pull Request:
http://code.google.com/r/b8732003-test/source/detail?r=ee646e49a323292d4fca7bb4873b0c24d632878e

Also have the same problem in Set Extend Menu Item.

Because "Merge" and "Abort Merge" use the same menu id, "About Merge" should be behind "Merge".

Because "Edit conflicts" and "Resolved" is put together with "About Merge", they moved, too.