start new:
tmux
start new with session name:
tmux new -s myname
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
/system script | |
add name="Music: Super Mario Bros" owner=admin policy=read source=":beep frequency=660 length=100ms;\ | |
\n:delay 150ms;\ | |
\n:beep frequency=660 length=100ms;\ | |
\n:delay 300ms;\ | |
\n:beep frequency=660 length=100ms;\ | |
\n:delay 300ms;\ | |
\n:beep frequency=510 length=100ms;\ | |
\n:delay 100ms;\ | |
\n:beep frequency=660 length=100ms;\ |
#!/usr/bin/env python | |
import sys | |
import cv2 | |
import subprocess | |
from subprocess import call | |
import aalib | |
import Image |
#!/bin/bash | |
# install qemu utils | |
sudo apt install qemu-utils | |
# install nbd client | |
sudo apt install nbd-client |