snix/third_party/git/mergetools
Vincent Ambo f4609b896f merge(3p/git): Merge git subtree at v2.29.2
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because
there is some breakage in the git build related to the netrc
credentials helper which someone has taken care of in nixpkgs.

The stable channel is not used for anything other than git, so this
should be fine.

Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
2020-11-21 19:45:56 +01:00
..
araxis
bc merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
codecompare
deltawalker
diffmerge
diffuse
ecmerge
emerge
examdiff
guiffy
gvimdiff
kdiff3
kompare
meld merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
nvimdiff merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
opendiff
p4merge
smerge
tkdiff
tortoisemerge
vimdiff merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
winmerge
xxdiff