On 2009-02-10 14:14:17 +0000, Catalin Marinas wrote:
> Since Git already has a tool for interactively solving conflicts
> which is highly customisable, there is no need to duplicate this
> feature via the i3merge and i2merge configuration options. The
> user-visible change is that now mergetool is invoked rather than the
> previously customised interactive merging tool.
Very good.
> +def mergetool(self, files = []):
> + """Invoke 'git mergetool' to resolve any outstanding conflicts."""
> + err = os.system('git mergetool %s' % ' '.join(files))
> + if err:
> + raise GitException('"git mergetool" failed, exit code: %d' % err)
Again, what happens if "files" is not given?
> @@ -754,7 +758,6 @@ def resolved(filenames, reset = None):
> '--stdin', '-z').input_nulterm(filenames).no_output()
> GRun('update-index', '--add', '--').xargs(filenames)
> for filename in filenames:
> - gitmergeonefile.clean_up(filename)
> # update the access and modificatied times
> os.utime(filename, None)
Hmm, what does this line do, and why isn't it needed anymore? I don't
know this part of StGit, I'm just curious ...
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
