Merge branch 'jc/mv-d-to-d-error-message-fix'

Typofix in an error message.

* jc/mv-d-to-d-error-message-fix:
  mv: fix error for moving directory to another

diff --cc builtin/mv.c
index 05e7156034e04d637990cabf105f7fa967b0f2aa,80fc7a3c7029603a0fcaf9d15d8432ed799b4909..c596515ad0536f4b13ce2fdc2a797f6aaa9df70a
--- 1/builtin/mv.c
--- 2/builtin/mv.c
+++ b/builtin/mv.c
@@@ -304,8 -303,8 +304,8 @@@ int cmd_mv(int argc, const char **argv
                        goto act_on_entry;
                }
                if (S_ISDIR(st.st_mode)
 -                  && lstat(dst, &st) == 0) {
 +                  && lstat(dst, &dest_st) == 0) {
-                       bad = _("cannot move directory over file");
+                       bad = _("destination already exists");
                        goto act_on_entry;
                }