Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: >> All the other uses seem to be just a case of >> >> git-merge-index -o git-merge-one-file -a >> >> and wouldn't it be beautiful if the default action for git-merge-index (if >> you do _not_ specify a merger program) was to do the simple one-file >> three-way merge that we can already do for real merges? > > If you think that's a new dream: > > http://article.gmane.org/gmane.comp.version-control.git/32046/match=git-merge-one-file (OT: heh, I did not notice Linus's mailing address when I saw his message for the first time). I've thought about it when I was really bored, but noticed that we have no serious users of git-merge-index/git-merge-one-file combinations anymore in-tree (octopus does not count, and it is trivial to make it use merge-recursive if somebody is twisted enough). - 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