-def resolved(filenames, reset = None):
- if reset:
- stage = {'ancestor': 1, 'current': 2, 'patched': 3}[reset]
- Run('git', 'checkout-index', '--no-create', '--stage=%d' % stage,
- '--stdin', '-z').input_nulterm(filenames).no_output()
- git.add(filenames)
- for filename in filenames:
- os.utime(filename, None) # update the access and modificatied times
-