[glib: 3/3] Merge branch 'wip/oholy/gio-tool-arguments' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 2b4c9625411b92fc4d2d2b8651cd0a6e6b11639e
Merge: ed4ff3156 2cb2a617f
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon May 28 13:40:29 2018 +0000

    Merge branch 'wip/oholy/gio-tool-arguments' into 'master'
    
    Fix some inconsistencies regarding arguments in gio-tool
    
    See merge request GNOME/glib!18

 gio/gio-tool-cat.c     |  2 +-
 gio/gio-tool-copy.c    |  2 +-
 gio/gio-tool-info.c    |  2 +-
 gio/gio-tool-list.c    |  2 +-
 gio/gio-tool-mkdir.c   |  2 +-
 gio/gio-tool-monitor.c |  2 +-
 gio/gio-tool-mount.c   | 12 +++++++++---
 gio/gio-tool-move.c    |  2 +-
 gio/gio-tool-open.c    |  2 +-
 gio/gio-tool-remove.c  |  2 +-
 gio/gio-tool-set.c     |  2 +-
 gio/gio-tool-trash.c   | 13 ++++++++++---
 gio/gio-tool-tree.c    |  2 +-
 gio/gio-tool.c         |  2 +-
 14 files changed, 31 insertions(+), 18 deletions(-)
---