[nautilus] (2 commits) Non-fast-forward update to branch alex-fazakas-duplicate-warning

[Carlos Soriano <csoriano src gnome org>]

The branch 'alex-fazakas-duplicate-warning' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  b323b40... file-operations: Fix undo-duplicate critical

Commits added to the branch:

  bc93e1c... file-name-widget : Warn if the name will hide the file (*)
  5b602f7... file-operations: Fix undo-duplicate critical

(*) This commit already existed in another branch; no separate mail sent