Merge branch 'dl/stash-show-untracked-fixup'

Another brown paper bag inconsistency fix for a new feature
introduced during this cycle.

* dl/stash-show-untracked-fixup:
  stash show: use stash.showIncludeUntracked even when diff options given

diff --cc builtin/stash.c
Simple merge

diff --cc t/t3905-stash-include-untracked.sh
Simple merge