yinjiaji Fykec

## USING-DIFFMERGE.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                Fykec
                / USING-DIFFMERGE.md
            
            
              Last active
              November 11, 2021 07:20
                — forked from smoll/USING-DIFFMERGE.md
            
              
                Using DiffMerge as your git mergetool (for Mac OS X / macOS)
              
          
    Using DiffMerge as your git mergetool (for Mac OS X / macOS)

Reference(s):

http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/
http://stackoverflow.com/a/1251696

Step 1: download and install the DiffMerge OS X Installer


## DefaultplusEmacs.idekeybings
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>Menu Key Bindings</key>
	<dict>
		<key>Key Bindings</key>
		<array>
			<dict>
				<key>Action</key>

## EquivalentBinaryTrees.go
package main

import "golang.org/x/tour/tree"


// Walk walks the tree t sending all values
// from the tree to the channel ch.
func Walk(t *tree.Tree, ch chan int) {
	if t.Left != nil {
		Walk(t.Left, ch)

## v2tov3.sql
/* 更新数据表结构*/
CREATE TABLE IF NOT EXISTS "mapping_user_plan" (
  "id" integer PRIMARY KEY,
  "user_id" integer,
  "plan_id" integer,
  "created_at" text
);

/* 也可以更新数据 */
insert into mapping_user_plan(user_id, plan_id, created_at) select 1, id, created_at from plan;

## sqlites_migration_run.sh
#!/usr/bin/env bash

## 数据库路径名
db_file="demo.db"
## 当前最新版本
cur_version=1

# 检查 sqlite3 命令行 工具是否已经安装
if ! [ -x "$(command -v sqlite3)" ]; then
  echo 'Error: sqlite3 is not installed.' >&2

## sslocal.service
[Unit]
Description=Daemon to start Shadowsocks Client
Wants=network-online.target
After=network.target

[Service]
Type=simple
ExecStart=/usr/bin/sslocal -c /etc/shadowsocks/client.json --pid-file /var/run/sslocal.pid --log-file /var/log/sslocal.log

[Install]

## index.html
<!DOCTYPE html>
<html>
<head>
  <meta charset="utf-8">
  <title>JS Bin</title>
<style id="jsbin-css">
/*CSS reset*/
body{font-size: 16px; line-height: 1.6;}
*{padding:0;margin: 0; box-sizing: border-box;}
ul, ol{list-style: none;}

## .bash_profile
function wopen { # via https://gist.github.com/coryalder/5609996
  WORKSPACE="${PWD##*/}.xcworkspace"
  PROJECT="${PWD##*/}.xcodeproj"
  if [ -a $WORKSPACE ]; then
    open $WORKSPACE;
  elif [ -a $PROJECT ]; then
    open $PROJECT;
  else
    echo "No workspace or project found.";
  fi

## objc.cfg
#
# uncrustify config file for objective-c and objective-c++
#

indent_with_tabs        = 0     # 1=indent to level only, 2=indent with tabs
output_tab_size         = 4     # new tab size
indent_columns          = output_tab_size
indent_label            = 2     # pos: absolute col, neg: relative column
indent_align_assign     = FALSE


## debug_all_selectors
p int $num = 0;
expr Method *$m = (Method *)class_copyMethodList((Class)object_getClass(self), &$num);
expr for(int i=0;i<$num;i++) { (void)NSLog(@"%s",(char *)sel_getName((SEL)method_getName($m[i]))); }
	<?xml version="1.0" encoding="UTF-8"?>
	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
	<plist version="1.0">
	<dict>
	<key>Menu Key Bindings</key>
	<dict>
	<key>Key Bindings</key>
	<array>
	<dict>
	<key>Action</key>
	package main

	import "golang.org/x/tour/tree"


	// Walk walks the tree t sending all values
	// from the tree to the channel ch.
	func Walk(t *tree.Tree, ch chan int) {
	if t.Left != nil {
	Walk(t.Left, ch)
	/* 更新数据表结构*/
	CREATE TABLE IF NOT EXISTS "mapping_user_plan" (
	"id" integer PRIMARY KEY,
	"user_id" integer,
	"plan_id" integer,
	"created_at" text
	);

	/* 也可以更新数据 */
	insert into mapping_user_plan(user_id, plan_id, created_at) select 1, id, created_at from plan;
	#!/usr/bin/env bash

	## 数据库路径名
	db_file="demo.db"
	## 当前最新版本
	cur_version=1

	# 检查 sqlite3 命令行工具是否已经安装
	if ! [ -x "$(command -v sqlite3)" ]; then
	echo 'Error: sqlite3 is not installed.' >&2
	[Unit]
	Description=Daemon to start Shadowsocks Client
	Wants=network-online.target
	After=network.target

	[Service]
	Type=simple
	ExecStart=/usr/bin/sslocal -c /etc/shadowsocks/client.json --pid-file /var/run/sslocal.pid --log-file /var/log/sslocal.log

	[Install]
	<!DOCTYPE html>
	<html>
	<head>
	<meta charset="utf-8">
	<title>JS Bin</title>
	<style id="jsbin-css">
	/CSS reset/
	body{font-size: 16px; line-height: 1.6;}
	*{padding:0;margin: 0; box-sizing: border-box;}
	ul, ol{list-style: none;}
	function wopen { # via https://gist.github.com/coryalder/5609996
	WORKSPACE="${PWD##*/}.xcworkspace"
	PROJECT="${PWD##*/}.xcodeproj"
	if [ -a $WORKSPACE ]; then
	open $WORKSPACE;
	elif [ -a $PROJECT ]; then
	open $PROJECT;
	else
	echo "No workspace or project found.";
	fi
	#
	# uncrustify config file for objective-c and objective-c++
	#

	indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs
	output_tab_size = 4 # new tab size
	indent_columns = output_tab_size
	indent_label = 2 # pos: absolute col, neg: relative column
	indent_align_assign = FALSE
	p int $num = 0;
	expr Method $m = (Method )class_copyMethodList((Class)object_getClass(self), &$num);
	expr for(int i=0;i<$num;i++) { (void)NSLog(@"%s",(char *)sel_getName((SEL)method_getName($m[i]))); }