VCS: shelved changes: navigatable show diff: allow conflicting changes to be shown...