On 0, Markus Heidelberg <markus.heidelberg@xxxxxx> wrote: > Charles Bailey, 02.04.2009: > > > > I think that it would be better if $status stayed as local as > > possible. If run_mergetool returned the value of $status as its exit > > code then the function will properly return whether the merge > > succeeded or not. > > > > This way run_mergetool's clients can just use its exit code, without > > having to know about a magic $status global variable. > > And shouldn't also check_unchanged() move from git-mergetool.sh to > git-mergetool--lib.sh, since it is only used there? > Huh, it seems as if some editors for difftool cannot work correctly > currently, because this function is used, but defined in > git-mergetool.sh. Sounds good. A patch is on the way: - moves check_unchanged into mergetool--lib - returns $status in run_mergetool - updates mergetool to not rely on the global $status -- David -- 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