Skip to content

Commit

Permalink
Merge pull request #293 from garymm/develop
Browse files Browse the repository at this point in the history
Set --no-ext-diff when running git diff
  • Loading branch information
kahole authored Mar 25, 2024
2 parents 5254658 + 4ee6091 commit d02ed6f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/commands/diffingCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ async function diffWorktree({ repository }: MenuState) {
}

async function diff(repository: MagitRepository, id: string, args: string[] = []) {
const diffResult = await gitRun(repository.gitRepository, ['diff', ...args]);
const diffResult = await gitRun(repository.gitRepository, ['diff', '--no-ext-diff', ...args]);

const uri = DiffView.encodeLocation(repository, id);
return ViewUtils.showView(uri, new DiffView(uri, diffResult.stdout));
Expand Down

0 comments on commit d02ed6f

Please sign in to comment.