npm package discovery and stats viewer.

Discover Tips

  • General search

    [free text search, go nuts!]

  • Package details

    pkg:[package-name]

  • User packages

    @[username]

Sponsor

Optimize Toolset

I’ve always been into building performant and accessible sites, but lately I’ve been taking it extremely seriously. So much so that I’ve been building a tool to help me optimize and monitor the sites that I build to make sure that I’m making an attempt to offer the best experience to those who visit them. If you’re into performant, accessible and SEO friendly sites, you might like it too! You can check it out at Optimize Toolset.

About

Hi, 👋, I’m Ryan Hefner  and I built this site for me, and you! The goal of this site was to provide an easy way for me to check the stats on my npm packages, both for prioritizing issues and updates, and to give me a little kick in the pants to keep up on stuff.

As I was building it, I realized that I was actually using the tool to build the tool, and figured I might as well put this out there and hopefully others will find it to be a fast and useful way to search and browse npm packages as I have.

If you’re interested in other things I’m working on, follow me on Twitter or check out the open source projects I’ve been publishing on GitHub.

I am also working on a Twitter bot for this site to tweet the most popular, newest, random packages from npm. Please follow that account now and it will start sending out packages soon–ish.

Open Software & Tools

This site wouldn’t be possible without the immense generosity and tireless efforts from the people who make contributions to the world and share their work via open source initiatives. Thank you 🙏

© 2025 – Pkg Stats / Ryan Hefner

git-diff3c

v0.1.1

Published

solve merge conflicts fast

Vulnerabilities

Powered byPowered by Snyk
  • 0High
  • 0Medium
  • 0Low

Links

Git

Maintainers

kipraskipras

Keywords

Readme

git-diff3c

when reviewing merge conflicts, especially in a rebase, it's useful to visualize the diff between

  1. old changes -> new old changes (what upstream changed), and
  2. old changes -> new changes (what you changed)

setup

dependencies:

  • nodejs
    • yarn (npm i -g yarn)
    • diff-so-fancy (e.g. npm i -g diff-so-fancy)
npm i -g yarn diff-so-fancy

install

git clone https://github.com/kiprasmel/git-diff3c.git
# or:  git clone [email protected]:kiprasmel/git-diff3c.git

cd git-diff3c

./setup-and-update.sh

git config --global merge.conflictStyle=zdiff3
# https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-mergeconflictStyle

and add to ~/.profile or equiv:

export PATH="$(yarn global dir)/node_modules/.bin:$PATH"

usage

git-diff3c
# specific files
git-diff3c [/path/to/file/with/conflicts[,/another]]