diff --git a/vimmerge b/vimmerge index ee87d7a..d355642 100755 --- a/vimmerge +++ b/vimmerge @@ -42,7 +42,7 @@ main() { cmd=${0%merge} cmd=${cmd##*/} - args=$(getopt -o m:y:o:w:bq --long mine:,yours:,older:,write:,quiet,backup -n "$0" -- "$@") || exit + args=$(getopt -o m:y:o:w:bq --long mine:,yours:,older:,write:,quiet,backup,version -n "$0" -- "$@") || exit eval set -- "$args" while true; do @@ -54,6 +54,7 @@ main() { -w|--write) write=$2; shift 2 ;; --order) order=$2; shift 2 ;; -q|--quiet) quiet=true; shift ;; + --version) echo "${cmd}merge 1.0.1"; exit 0 ;; --) shift; break ;; *) echo "failed to process cmdline args" >&2; exit 1 ;; esac