Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: whiteinge/diffconflicts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: yun-cloud/diffconflicts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 8, 2024

  1. ShowHistory seperate the 3 way diff 

    ShowHistory now show two seperate diff:
1. base vs. local
2. base vs. remote

It's easier to spot the difference that local and remote make

note the diff is now
`:terminal git diff --no-index`

which utilize the features of delta: color output, word-level highlight,
etc.

Note this is now requires neovim `:terminal` feature
    @yun-cloud
    yun-cloud committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5b2b2d6 View commit details
    Browse the repository at this point in the history
Loading