Comment 4 for bug 828803

The bug is specifically in the get_merge_tools function in GlobalConfig. It uses an internal _get_options function since it needs the option names in addition to their values. It was assuming that the value was the unquoted value but it appears that this changed at some point since my initial implementation. Changing it to use self.get_user_option() to get the value has fixed the problem.