From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2020 20:20:35 +0000 (-0700)
Subject: Merge branch 'ct/mv-unmerged-path-error' into master
X-Git-Tag: v2.29.0-rc0~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be2dab9c801fe28a6937e8d426f891e610a82a49;p=thirdparty%2Fgit.git

Merge branch 'ct/mv-unmerged-path-error' into master

"git mv src dst", when src is an unmerged path, errored out
correctly but with an incorrect error message to claim that src is
not tracked, which has been clarified.

* ct/mv-unmerged-path-error:
  git-mv: improve error message for conflicted file
---

be2dab9c801fe28a6937e8d426f891e610a82a49