aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-04-27 21:22:44 +0200
committerAdrian Kummerlaender2019-04-27 21:22:44 +0200
commit5b0649f18ad2b63614f527a9002c1db621afd370 (patch)
tree9b49ac719284fa0202ae7049992ac16c33494d14 /gui
parent9ecd5f01f88f2d550e23156f7143154cd248c699 (diff)
downloadnixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.gz
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.bz2
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.lz
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.xz
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.tar.zst
nixos_home-5b0649f18ad2b63614f527a9002c1db621afd370.zip
Set meld as git merge tool
Diffstat (limited to 'gui')
-rw-r--r--gui/apps/dev.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix
index 4f3bf2e..9b2c044 100644
--- a/gui/apps/dev.nix
+++ b/gui/apps/dev.nix
@@ -7,8 +7,10 @@
zeal
hotspot
qcachegrind
- gitg
paraview
+ # version control
+ gitg
+ meld
# language utilities
artha
];