dir-merge in a subdirectory

[Wayne Davison]

On Tue, Aug 05, 2008 at 08:55:10PM -0400, Matt McCutchen wrote:
> I've been working on this; my patch in progress is attached.

Thanks, Matt!  I've saved that off and am looking into integrating it
for the trunk (and adding a merge-file debugging category).  I've
fiddled with it a bit so far, and will do some more debugging in this
area soon (such as looking for that crash you mentioned).  If you come
up with more changes, let me know.

..wayne..