Toolkit: Meld
For my work I needed to merge differences between two files into a new file and doing this by just watching output from 'diff' is a little bit too annoying to do. I remembered somebody recommending Meld too me. It shows the differences in a clear graphical way and also allows you to edit the text in the files, which is ideal for a scripting language like PHP. It saved me a lot of problems merging the changes, the only 'problem' is that it doesn't integrate with Subversion the version control system we use for eZ Publish.
Here is also a screenshot of Meld in action:
Life Line
What new fresh hell is this?
"Please click here and tick the box if you DO NOT want to be opted in."
And when you click on the non-visible link:
"[ ] I DO NOT want to be opted in."
@jamesholden Have you ever seen the Expanse? One of the main characters shares your name!
I walked 4.4km in 51m58s
I walked 8.2km in 1h40m07s
I walked 2.4km in 38m25s
@Edent With your ActivityPub implementation, have you figured out how to allow quote posts for your bot posts yet?
📷 Brown Cap in the Grass
🚩 Herikhuizerweg, Rheden, Nederland
I walked 0.9km in 11m17s
I walked 2.8km in 25m32s
I walked 4.6km in 1h8m02s
I hiked 23.0km in 4h10m15s
I walked 3.9km in 39m07s
After my PHP 8.5 in Leeds last night, it's now time to head to Rotterdam to give the same talk there tonight!
It's cold out here, but atleast the snow is now gone.
I walked 1.7km in 13m18s
📷 Avenue Gardens
🚩 Princess Road, London Borough of Brent, United Kingdom
#AutumnColours #FallColours #Photography
📷 Leafy Entrance
🚩 East Heath Road, London Borough of Camden, United Kingdom
#AutumnColours #FallColours #Photography
📷 From Green to Yellow.
🚩 St John's Wood Road, City of Westminster, United Kingdom
#AutumnColours #FallColours #Photography
I walked 9.1km in 1h56m24s
Shortlink
This article has a short URL available: https://drck.me/toolkit-meld_1o