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: NixOS/nixpkgs
base: aaf2ecd801c3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 377cd8a1eafd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 25, 2019

  1. lib/types: change merge strategy for str, int, float and enum 

    Change to `mergeEqualOption`.
    @danbst
    danbst committed Jul 25, 2019
    Copy the full SHA
    7953832 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. Merge pull request #65380 from danbst/int-merge-one-option 

    lib/types: change merge strategy for `str`, `int`, `float`, `path` and `enum`
    @infinisil
    infinisil committed Jul 29, 2019
    Copy the full SHA
    377cd8a View commit details
    Browse the repository at this point in the history