[nautilus] (4 commits) Non-fast-forward update to branch 1344-be-a-little-more-helpful-with-renaming-duplicate-files

[António Fernandes <antoniof src gnome org>]

The branch '1344-be-a-little-more-helpful-with-renaming-duplicate-files' 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:

  3c3e921... file-conflict-dialog: Tie default action to expander
  973173b... operations-ui-manager: Rename struct field
  bd6975f... file-conflict-dialog: Automatically suggest new name
  c269b1a... file-conflict-dialog: Make manual rename more convenient

Commits added to the branch:

  8d16a32... file-conflict-dialog: Tie default action to expander
  1d2a116... operations-ui-manager: Rename struct field
  a509909... file-conflict-dialog: Automatically suggest new name
  c395f0f... file-conflict-dialog: Make manual rename more convenient