maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
snix/third_party/git/mergetools
History
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 merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
bc merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
codecompare merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
deltawalker merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
diffmerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
diffuse merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
ecmerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
emerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
examdiff merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
guiffy merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
gvimdiff merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
kdiff3 merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
kompare merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
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 merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
p4merge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
smerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
tkdiff merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
tortoisemerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
vimdiff merge(3p/git): Merge git subtree at v2.29.2 2020-11-21 19:45:56 +01:00
winmerge merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00
xxdiff merge(third_party/git): Merge squashed git subtree at v2.23.0 2020-01-11 23:40:29 +00:00