zsh could check via
bindkey -L
Keybinding | Action |
---|
##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)
// Solarized for Mosh Chrome | |
// Mosh does not seem to save profiles, so this sets the default 'mosh' profile. | |
// To reset, evaluate term_.prefs_.resetAll() | |
// Run in the JavaScript console of mosh_browser.html, which can be opened | |
// as explained here: | |
// https://github.com/rpwoodbu/mosh-chrome/wiki/FAQ#how-can-i-change-the-way-the-terminal-looks-font-color-etc | |
var htermProfiles = { | |
// Solarized Dark |
#!/bin/bash | |
echo "This script prints the filenames of any dylibs in your /usr/local/ that depend on the System Python" | |
for f in `find /usr/local/lib`; do | |
otool -L "$f" 2> /dev/null| grep Python | grep System &> /dev/null | |
status=$? | |
if [ $status -eq 0 ]; then | |
echo "$status: $f" | |
fi | |
done |