diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-06-14T21·17+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-06-14T21·47+0000 |
| commit | 1a4465d7d3726e61cf95c6455330f779d760f5db (patch) | |
| tree | 9a225a5763a5309df6fa302c20ed0d75f53d16aa /third_party/git/xdiff/xmerge.c | |
| parent | 417d1c8a49f9d219394512f1d667ef8710f7876e (diff) | |
chore(3p/nixpkgs): Bump unstable channel to 2021-06-14 r/2665
Included fixes: * 3p/apereo-cas: Don't use stdenv.lib * grfn/system: Bump Linux to 5.12 (5.11 is gone) Change-Id: Ie32d476e659ba482418d4035333c2797a7dbd106 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3211 Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/git/xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions