Fix "--diff
implies --no-stash
" feature
#1303
Merged
--diff
implies --no-stash
" feature
#1303