commitmsg: disable the "amend" action when merging
commit49aefb0283d93462600b08fabeee3f8adb988a0b
authorDavid Aguilar <davvid@gmail.com>
Fri, 25 Oct 2013 09:57:01 +0000 (25 02:57 -0700)
committerDavid Aguilar <davvid@gmail.com>
Fri, 25 Oct 2013 10:02:15 +0000 (25 03:02 -0700)
treef287d733c5550f9a7620296b50c65aa1725bb3a1
parentad19d8a760fc689b18003567283cf1a4b8e809cc
commitmsg: disable the "amend" action when merging

Make the amend action sensiive to in-progress merges.  The action is now
disabled to prevent users from seeing the "do not amend while merging"
message.

Signed-off-by: David Aguilar <davvid@gmail.com>
cola/widgets/commitmsg.py