2 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
index e1f862797f5..e31cac49d44 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
@@ -425,6 +425,18 @@
 
     setSubmitState(state) {
       this.state.isSubmitting = state;
+    },
+
+    fileTextTypePresent() {
+      let found = false;
+
+      this.state.conflictsData.files.find((f) => {
+        if (f.type === CONFLICT_TYPES.TEXT) {
+          return found = true;
+        }
+      });
+
+      return found;
     }
   };
 
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
index b5123e22f7a..449b4d2209a 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
@@ -21,7 +21,8 @@ $(() => {
     computed: {
       conflictsCountText() { return mergeConflictsStore.getConflictsCountText() },
       readyToCommit() { return mergeConflictsStore.isReadyToCommit() },
-      commitButtonText() { return mergeConflictsStore.getCommitButtonText() }
+      commitButtonText() { return mergeConflictsStore.getCommitButtonText() },
+      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent() }
     },
     created() {
       mergeConflictsService