Removed useless merge_authors configuration option. Use .mailmap instead.

Signed-off-by: Heikki Hokkanen <hoxu@users.sf.net>

gitstats

@@ -46,7 +46,6 @@ conf = {
 	'commit_end': 'HEAD',
 	'linear_linestats': 1,
 	'project_name': '',
-	'merge_authors': {},
 	'processes': 8,
 	'start_date': ''
 }
@@ -323,8 +322,6 @@ class GitDataCollector(DataCollector):
 				parts = re.split('\s+', line, 2)
 				commits = int(parts[1])
 				author = parts[2]
-				if author in conf['merge_authors']:
-					author = conf['merge_authors'][author]
 				self.tags[tag]['commits'] += commits
 				self.tags[tag]['authors'][author] = commits
 
@@ -341,8 +338,6 @@ class GitDataCollector(DataCollector):
 			timezone = parts[3]
 			author, mail = parts[4].split('<', 1)
 			author = author.rstrip()
-			if author in conf['merge_authors']:
-				author = conf['merge_authors'][author]
 			mail = mail.rstrip('>')
 			domain = '?'
 			if mail.find('@') != -1:
@@ -555,8 +550,6 @@ class GitDataCollector(DataCollector):
 				if pos != -1:
 					try:
 						(stamp, author) = (int(line[:pos]), line[pos+1:])
-						if author in conf['merge_authors']:
-							author = conf['merge_authors'][author]
 						self.changes_by_date[stamp] = { 'files': files, 'ins': inserted, 'del': deleted, 'lines': total_lines }
 
 						date = datetime.datetime.fromtimestamp(stamp)
@@ -613,8 +606,6 @@ class GitDataCollector(DataCollector):
 					try:
 						oldstamp = stamp
 						(stamp, author) = (int(line[:pos]), line[pos+1:])
-						if author in conf['merge_authors']:
-							author = conf['merge_authors'][author]
 						if oldstamp > stamp:
 							# clock skew, keep old timestamp to avoid having ugly graph
 							stamp = oldstamp
@@ -1432,9 +1423,6 @@ class GitStats:
 					raise KeyError('no such key "%s" in config' % key)
 				if isinstance(conf[key], int):
 					conf[key] = int(value)
-				elif isinstance(conf[key], dict):
-					kk,vv = value.split(',', 1)
-					conf[key][kk] = vv
 				else:
 					conf[key] = value
 			elif o in ('-h', '--help'):