• Junio C Hamano's avatar
    merge: loosen overcautious "working file will be lost" check. · ed93b449
    Junio C Hamano authored
    The three-way merge complained unconditionally when a path that
    does not exist in the index is involved in a merge when it
    existed in the working tree.  If we are merging an old version
    that had that path tracked, but the path is not tracked anymore,
    and if we are merging that old version in, the result will be
    that the path is not tracked.  In that case we should not
    Signed-off-by: default avatarJunio C Hamano <[email protected]>
git-merge-one-file.sh 3.11 KB