Skip to content

Better diff for deleted file in merge conflict#91245

Merged
joaomoreno merged 3 commits intomicrosoft:masterfrom
jeanp413:better-diff-merge-deleted
Nov 5, 2020
Merged

Better diff for deleted file in merge conflict#91245
joaomoreno merged 3 commits intomicrosoft:masterfrom
jeanp413:better-diff-merge-deleted

Conversation

@jeanp413
Copy link
Contributor

This PR fixes #88973

@joaomoreno joaomoreno added the git GIT issues label Feb 26, 2020
@valdman
Copy link

valdman commented Jun 18, 2020

@joaomoreno Is there a chance this PR could be merged?

@joaomoreno
Copy link
Member

👌 🍻

@joaomoreno joaomoreno merged commit 818d57d into microsoft:master Nov 5, 2020
@joaomoreno joaomoreno added this to the November 2020 milestone Nov 5, 2020
@jeanp413 jeanp413 deleted the better-diff-merge-deleted branch November 5, 2020 14:59
@github-actions github-actions bot locked and limited conversation to collaborators Dec 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Better diff for deleted file merge conflict

3 participants