Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: be7ce1b0e9809da1f41571a63584fb8b9e346295
https://github.com/NixOS/nixpkgs/commit/be7ce1b0e9809da1f41571a63584fb8b9e346295
Author: Vladimír Čunát <vcu...@gmail.com>
Date: 2017-04-20 (Thu, 20 Apr 2017)
Changed paths:
M pkgs/tools/text/kdiff3/default.nix
Log Message:
-----------
kdiff3: fix with git mergetool
The quick patch has been submitted upstream.
Commit: 38933324a69d7fec9bd76056950ff3feb9dd131c
https://github.com/NixOS/nixpkgs/commit/38933324a69d7fec9bd76056950ff3feb9dd131c
Author: Michael Raskin <7c6f4...@mail.ru>
Date: 2017-04-20 (Thu, 20 Apr 2017)
Changed paths:
M pkgs/tools/text/kdiff3/default.nix
Log Message:
-----------
Merge pull request #25059 from vcunat/p/kdiff3-git-mergetool
kdiff3: fix with git mergetool
Compare: https://github.com/NixOS/nixpkgs/compare/d15f26ec69e3...38933324a69d
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits