Skip to content

Commit

Permalink
v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
agriffis committed Mar 21, 2018
1 parent b57d83a commit d8f53ab
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion vimmerge
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit d8f53ab

Please sign in to comment.