Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file

It seems that changes has been committed to
Documentation/git-read-tree.txt in both the jdl branch and in
origin.

Yes.

This shouldn't cause any problems but git-merge-recursive
(which currently is the default merge strategy) uses merge(1) to do
the file-level merging and it seems like merge(1) can't be found on
your system.

Do you have merge(1) installed? More appropriately, is merge in your
path? If it isn't installed it can usually be found in the rcs package
in your distribution.

Oh wow.  Exactly correct.

Here's Jon building up the new Ubuntu box, and thinking, "I'll
be using git, so I don't need to install RCS or CVS anymore." :-)

After installing RCS, here's what we get:

    jdl@ubuntu:/usr/src/git-core$ git reset --hard jdl
    jdl@ubuntu:/usr/src/git-core$ git pull . origin
    Trying really trivial in-index merge...
    fatal: Merge requires file-level merging
    Nope.
    Merging HEAD with be61db922a230ae2638c27c071ee4b8c98f01f72
    Merging:
    4baf91676c2462796137e93917c75f2e14ebb877 Added documentation for few missing options.
    be61db922a230ae2638c27c071ee4b8c98f01f72 git-merge-one-file: resurrect leading path creation.
    found 1 common ancestor(s):
    23c99d84601316c1e51ebc1f0b9bec5cddd011fb git-mv to work with Perl 5.6
    Auto-merging Documentation/git-read-tree.txt
    CONFLICT (content): Merge conflict in Documentation/git-read-tree.txt

    Automatic merge failed/prevented; fix up by hand


Thanks!
jdl