Public » Miscellaneous » Dotfiles Read More
Clone URL:  
Pushed to one repository · View In Graph Contained in tip and @

vim: add paredit, update bundles

Changeset 6b710d189e10…

Parent b92007ae90c4…

by Profile picture of Benjamin PollackBenjamin Pollack

Changes to 2 files · Browse files at 6b710d189e10 Showing diff from parent b92007ae90c4 Diff from another changeset...

Change 1 of 1 Show Entire File .hgsubstate Stacked
 
2
3
4
5
 
6
7
8
9
 
10
11
12
13
14
15
16
 
17
18
19
 
2
3
4
 
5
6
7
8
 
9
10
11
12
13
14
15
 
16
17
18
19
@@ -2,18 +2,18 @@
 661dbd42f386611a1c03f3eaf82927d3f1b874d8 hg-prompt  ad4db2310337bf83dd061b321b5efd544cdd4844 kiln-extensions  d09413cba5e9e3615ca3bfc02f0ee747485df0d1 mercurial-cli-templates -ad19d1a10f2b145d6eca8d1b9415dd317c74e2a0 vim/bundle/airline +310331cfc45ea1fbec8987042ed94c3740cc7041 vim/bundle/airline  528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/colors-solarized  8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1 vim/bundle/commentary  825853f4816a07e59ea2ecee1190ab6a5d9ef991 vim/bundle/fish -5e79cec920ede209842b43797168247212ef1189 vim/bundle/go +bfd315bee9f4233a90d70840dd4809438acb8125 vim/bundle/go  3975ac871565115e3769dc69c06bc88ddc1369af vim/bundle/gundo  f8122fd1caca68b2592553e43dad45b3dc445a06 vim/bundle/javascript  36901d6f1abe64d617866ea87da1795c50849c69 vim/bundle/less  409c37b205afa2f9d590e23de8171482d66770e2 vim/bundle/markdown  4f1e6ecb057fc0bac189171c1430d71ef25f6bb1 vim/bundle/nerdtree  c1e0659fffb039f10f0d8fbb9830e1b0647eaa1d vim/bundle/nimrod -7b6f33fa6f450c0d1ce0666ca6333cccdea6c59e vim/bundle/orgmode +f3f7b3e39e7e32ba3ab95e5e893bfc7848937973 vim/bundle/orgmode  2c241d1360c8f7711fbba22afbb6a96e1ebcc2b2 vim/bundle/ps1  c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/python-mode  2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
Change 1 of 2 Show Entire File gitconfig Stacked
 
9
10
11
12
 
13
14
15
 
16
17
18
 
22
23
24
 
 
 
 
 
 
 
 
 
 
 
 
 
 
9
10
11
 
12
13
14
 
15
16
17
18
 
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
@@ -9,10 +9,10 @@
  sa = stash --include-untracked   co = checkout   mf = merge --ff-only - wn = log --oneline --decorate --graph ..origin/master + wn = log ..origin/master  [user]   name = Benjamin Pollack - email = benjamin@bitquabit.com + email = bp@knewton.com  [color]   ui = true  [core] @@ -22,3 +22,16 @@
  default = simple  [merge]   defaultToUpstream = true + tool = semanticmerge +[diff] + tool = semanticdiff +[difftool "semanticdiff"] + cmd = /Applications/semanticmerge.app/Contents/MacOS/semanticmerge -s \"$LOCAL\" -d \"$REMOTE\" +[difftool] + prompt = false +[mergetool "semanticmerge"] + cmd = /Applications/semanticmerge.app/Contents/MacOS/semanticmerge -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\" + trustExitCode = true +[mergetool] + prompt = false + keepBackup = false