On 2009-03-12 12:09:02 +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.
I agree wholeheartedly with the idea. Just one issue:
> +def mergetool(files = ()):
> + """Invoke 'git mergetool' to resolve any outstanding conflicts. If 'not
> + files', all the files in an unmerged state will be processed."""
> + err = os.system('git mergetool %s' % ' '.join(files))
> + # check for unmerged entries (prepend 'CONFLICT ' for consistency with
> + # merge_recursive())
> + conflicts = ['CONFLICT ' + f for f in get_conflicts()]
> + if conflicts:
Mmm, os.system()? That'll break things as soon as we have a file name
with a space in it. I'm pretty sure there's something in stgit.run
that you could use.
--
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
