+ resolved(filename, reset)
+ os.remove(os.path.join(git.get_base_dir(), 'conflicts'))
+
+def name_email(address):
+ """Return a tuple consisting of the name and email parsed from a
+ standard 'name <email>' string
+ """
+ address = re.sub('([^\w\s<>@.])', '\\\\\\1', address)
+ str_list = re.findall('^(.*)\s*<(.*)>\s*$', address)
+ if not str_list:
+ raise CmdException, 'Incorrect "name <email>" string: %s' % address
+
+ return str_list[0]
+
+def name_email_date(address):
+ """Return a tuple consisting of the name, email and date parsed
+ from a 'name <email> date' string
+ """
+ address = re.sub('([^\w\s<>@.])', '\\\\\\1', address)
+ str_list = re.findall('^(.*)\s*<(.*)>\s*(.*)\s*$', address)
+ if not str_list:
+ raise CmdException, 'Incorrect "name <email> date" string: %s' % address
+
+ return str_list[0]