M E R G E ------------------------- [merge] tool = meld [mergetool "meld"] cmd = meld --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"
17 KB (2,636 words) - 13:02, 31 March 2020
newlines, we use `jq` to pretty-print the json output. Then it's an easy `meld` or `diff` to compare them. The `--silent` option to `curl` just suppresses
7 KB (1,132 words) - 11:25, 26 July 2024
--long, but there is a bit more information in showvminfo For comparison, try meld <$(VBoxManage list --long vms) <$(VBoxManage showvminfo vagrant_default_1418918147177_40503
7 KB (748 words) - 07:48, 3 January 2024
your repository get's complicated, but you don't have desktop tools like meld or gitk to look at it, you can copy the remote repo to your desktop with
20 KB (3,104 words) - 11:29, 22 October 2024
extensions and versions of software are installed and activated on your wiki. meld <(curl https://raw.githubusercontent.com/debtcompliance/mediawiki/master
22 KB (391 words) - 12:19, 20 June 2018