Skip to content
Browse files

Fixed merge command

  • Loading branch information...
1 parent aa07045 commit 54854af64d849377dd1253e3fff847f2640fe8f9 @localshred committed Dec 16, 2011
Showing with 31 additions and 1,202 deletions.
  1. +31 −13 Thorfile
  2. +0 −1,189 viminfo
View
44 Thorfile
@@ -9,19 +9,37 @@ class Dotfiles < Thor
method_option :out, :type => :string, :default => '~', :aliases => '-o', :banner => 'OUT_DIRECTORY'
def merge
DOTFILES.each do |file|
- say "Syncing #{File.basename(file)}", Thor::Shell::Color::YELLOW
- diff = `diff #{file} ~/.#{File.basename(file)}`
- if diff.empty?
- say 'No change', Thor::Shell::Color::GREEN
+ base = "~/.#{File.basename(file)}"
+ expanded_base = File.expand_path(base)
+ say "Syncing #{base}", :yellow
+ if File.exist?(expanded_base)
+ diff = `diff #{file} #{base}`
+ if diff.empty?
+ say 'No change', :green
+ else
+ say "diff [A] #{file} [B] #{base}", :blue
+ say diff
+ case ask("Pick the winner: [abs]").upcase.strip
+ when 'A' then
+
+ FileUtils.rm(expanded_base)
+ FileUtils.copy(file, expanded_base)
+ when 'B' then
+ FileUtils.rm(file)
+ FileUtils.copy(expanded_base, file)
+ else
+ say "Skipping merge for file #{base}", :red
+ end
+ end
else
- say "diff #{file} (A) ~/.#{File.basename(file)} (B)", Thor::Shell::Color::BLUE
- say diff
- case ask?("Pick the winner: [abn]").upcase.trim
- when 'A' then FileUtils.copy(file, "~/.#{File.basename(file)}")
- when 'B' then FileUtils.copy("~/.#{File.basename(file)}", file)
- else say "Skipping merge for file #{File.basename(file)}", Thor::Shell::Color::RED
- end
- end
+ if File.directory?(file)
+ say "Creating directory #{base}", :yellow
+ FileUtils.cp_r(file, expanded_base)
+ else
+ say "Creating file #{base}", :yellow
+ FileUtils.copy(file, expanded_base)
+ end
+ end
end
end
-end
+end
View
1,189 viminfo
@@ -1,1189 +0,0 @@
-# This viminfo file was generated by Vim 7.2.
-# You may edit it if you're careful!
-
-# Value of 'encoding' when this file was written
-*encoding=utf-8
-
-
-# hlsearch on (H) or off (h):
-~h
-# Last Search Pattern:
-~MSle0~/bx
-
-# Last Substitute Search Pattern:
-~MSle0&"
-
-# Last Substitute String:
-$
-
-# Command Line History (newest to oldest):
-:wq
-:q
-:w
-:x
-:%s/"/'/g
-:set paste
-:95
-:u
-:q!
-:20
-:%s/-M/- M/
-:%s/-M/-/
-:%s/'//
-:%s/,'/-/
-:%s/,?'/-/
-:%s/$/'/
-:%s/^/,'/
-:%/^/',/
-::
-:%s/$/'
-
-# Search String History (newest to oldest):
-?/bx
-? ^\d\{3}ÿ
-?/support
-?/node
-?/abacus1
-?/qa-ball
-? "
-?/pom
-?/fixtures
-?/git
-?/colorschem
-?/background
-?/treb
-?/loudmouth
-?/20
-?/ballista.money
-?/master
-? -M
-? '
-? ,'
-
-# Expression History (newest to oldest):
-
-# Input Line History (newest to oldest):
-
-# Input Line History (newest to oldest):
-
-# Registers:
-""0 CHAR 0
- d
-"1 LINE 0
-
-"2 LINE 0
-
-"3 LINE 0
- ForwardAgent yes
-"4 LINE 0
- ## Benny
- Host benny
- HostName 172.16.0.184
- User bj
- IdentityFile /Users/bj/.ssh/id_rsa.md
-"5 LINE 0
- 391
-<abacus1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAmzF1ycMWnbYT0xK/7J3TOldzjyLVgbFGCJA4ciNQcd/+23tW5Xsc6G+JpdicRG94ep47QTiI6JJ8xd7F/MsfAU5oO6hqOzK4iMzm63gagCIzBBhezDbgAz4hABZ/vPmdaYMR3tOnTF7poCdfa4TWwJjg+gpoCEOe+KERH85AGvx4/q9y0ZCszTzZrvSoRedFBp5yvYGl1k/9AuJZ93UXSYc+zPDQUNYN1GdDa7e5XavWjGwSPn5R3ZcJQzDkKec6muvuZ77MaUfU+rCe1YFTT385MWQEn6VEEbQNXMriK6IpmItS8NJaQrUhc0rOJq2atE5ILu9rStGg5vPxaWfnIQ==
-"6 LINE 0
- 421
-<abacus1.moneydesktop.com,172.16.11.32 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAmzF1ycMWnbYT0xK/7J3TOldzjyLVgbFGCJA4ciNQcd/+23tW5Xsc6G+JpdicRG94ep47QTiI6JJ8xd7F/MsfAU5oO6hqOzK4iMzm63gagCIzBBhezDbgAz4hABZ/vPmdaYMR3tOnTF7poCdfa4TWwJjg+gpoCEOe+KERH85AGvx4/q9y0ZCszTzZrvSoRedFBp5yvYGl1k/9AuJZ93UXSYc+zPDQUNYN1GdDa7e5XavWjGwSPn5R3ZcJQzDkKec6muvuZ77MaUfU+rCe1YFTT385MWQEn6VEEbQNXMriK6IpmItS8NJaQrUhc0rOJq2atE5ILu9rStGg5vPxaWfnIQ==
-"7 LINE 0
- 396
-<qa-ballista1 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAoXzFBjTjQkWdeaq+rcxcNKJd3xOHC6cvFuwlIhll0EVuFzukIVuHne+05RnuNV1u760ARYWS1jXIy8gZdbbWyy1YemfgOepLMcVgKU4yM/LJyqt/mnJk+ohsUAzEmEl9P3NmF3HzYzuBqnLS9dV8cfZD8JEQeNVBMuLw2d0Mkf9HjfR7zFkoi3jcoqUOhexFvfN4a7jP2LIz9B+5doTuBVSQnsINXi825xhbnFgN3eeQ60KbRtzKv7Sy8gw4mC5NMOlhPLsNqUkxp5OmgmKQg6rGJqUnNyAi18HMfy6QadME+18zHkUP6zHDnh1IJIdS5ehpgbfwdCtGO2xC2FRazQ==
-"8 LINE 0
- *.yml
-"9 LINE 0
- 398
-<cc,172.16.0.69 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAx3hy3GBNZ782nWhGCLDQ2Nzi0wpZmK8iilGqyUaCAvDmEvV7tbO0vKmcHY3diGW4T79F40uiGqzcqdecZKe/7Vu19sSn/aPet1EDLJpDfokf/yxGG5gLrj+fWZbiPzab6AtsDQR2HUKV8a4e7vIOjiGhzDbTdfjYZAwMVkuw7Eb9MyO+aiknGLoRYIdGWMl8Ao06WsmPFeX6rHRUyO9UsDmUB6Ro7YIWEDxvfx5d6enMrcI99XiI2H6jbs2anNTBF5NuTxwGav0tVftIvhzP1t0ZuH6LLHp5BcWPjCNq6RzrxiZJt4zPqMyQMH8zG86gxgdUZizR+m7FjXEWi5e2fw==
-"i CHAR 0
- iq�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�kr�krqa':w
-"- CHAR 0
- d
-
-# File marks:
-'0 42 28 ~/.oh-my-zsh/lib/aliases.zsh
-'1 1 43 /code/src/protobuf/.git/COMMIT_EDITMSG
-'2 1 0 /code/src/atlas/.bundle/config
-'3 2 2 ~/.rspec
-'4 8 28 /private/etc/hosts
-'5 142 36 ~/.ssh/config
-'6 1 29 /code/src/paladin/.rvmrc
-'7 1 0 /code/src/peon/.git/COMMIT_EDITMSG
-'8 24 210 ~/.zshrc
-'9 47 0 ~/.gitconfig
-
-# Jumplist (newest first):
--' 42 28 ~/.oh-my-zsh/lib/aliases.zsh
--' 44 0 ~/.oh-my-zsh/lib/aliases.zsh
--' 1 0 ~/.oh-my-zsh/lib/aliases.zsh
--' 1 43 /code/src/protobuf/.git/COMMIT_EDITMSG
--' 1 0 /code/src/atlas/.bundle/config
--' 9 0 /code/src/atlas/.bundle
--' 1 0 /code/src/atlas/.bundle
--' 8 0 /code/src/atlas/.bundle
--' 2 2 ~/.rspec
--' 1 0 ~/.rspec
--' 8 28 /private/etc/hosts
--' 11 0 /private/etc/hosts
--' 1 0 /private/etc/hosts
--' 142 36 ~/.ssh/config
--' 58 0 ~/.ssh/config
--' 1 0 ~/.ssh/config
--' 1 29 /code/src/paladin/.rvmrc
--' 1 0 /code/src/peon/.git/COMMIT_EDITMSG
--' 24 210 ~/.zshrc
--' 1 0 ~/.zshrc
--' 47 0 ~/.gitconfig
--' 1 0 ~/.gitconfig
--' 1 0 /code/src/zeus/.git/COMMIT_EDITMSG
--' 1 41 /code/src/ballista/.git/COMMIT_EDITMSG
--' 32 5 ~/.ssh/known_hosts
--' 166 0 ~/.ssh/known_hosts
--' 157 0 ~/.ssh/known_hosts
--' 127 4 ~/.ssh/known_hosts
--' 126 4 ~/.ssh/known_hosts
--' 75 6 ~/.ssh/known_hosts
--' 56 6 ~/.ssh/known_hosts
--' 53 5 ~/.ssh/known_hosts
--' 1 0 ~/.ssh/known_hosts
--' 167 0 ~/.ssh/known_hosts
--' 1 0 ~/mm.cfg
--' 1 0 ~/Desktop/institution_guids.txt
--' 1 0 /code/src/trebuchet/.git/COMMIT_EDITMSG
--' 16 9 ~/.trebrc
--' 1 0 ~/.trebrc
--' 29 17 ~/.gitconfig
--' 1 1 /private/tmp/system/a
--' 1 8 /code/src/parrot/.gitignore
--' 19 12 /code/src/ballista/.gitignore
--' 1 0 /code/src/ballista/.gitignore
--' 18 13 /code/src/ballista/.gitignore
--' 2 0 /code/src/ballista/.gitignore
--' 14 0 /code/src/ballista/.gitignore
--' 95 0 ~/.ssh/known_hosts
--' 111 0 ~/.ssh/known_hosts
--' 96 77 ~/.ssh/known_hosts
--' 5 0 ~/.ssh/known_hosts
--' 16 16 /code/src/ballista/.gitignore
--' 1 0 ~/.vimrc
--' 43 4 ~/.vimrc
--' 44 21 ~/.vimrc
--' 1 0 /code/src/bullseye/config/database.yml
--' 2 34 ~/errbit_cleanup
--' 1 0 ~/errbit_cleanup
--' 12 32 /code/src/paladin/package.json
--' 1 0 /code/src/paladin/package.json
--' 1 41 /code/src/paladin/.git/COMMIT_EDITMSG
--' 1 0 /code/src/jefe/config/database.yml
--' 7 13 /code/src/jefe/.gitignore
--' 1 0 /code/src/jefe/.gitignore
--' 3 6 /code/src/jefe/.gitignore
--' 13 13 /code/src/jefe/.git/config
--' 1 0 /code/src/jefe/.git/config
--' 37 3 ~/.gitconfig
--' 40 15 ~/.gitconfig
--' 1 0 /code/src/toolbox/.rvmrc
--' 40 0 /code/src/amigo/Gemfile
--' 1 0 /code/src/amigo/Gemfile
--' 1 0 /code/src/abacus/.rvmrc
--' 24 1 ~/.gitconfig
--' 44 0 ~/.ssh/known_hosts
--' 28 0 ~/.ssh/known_hosts
--' 20 0 ~/.ssh/known_hosts
--' 91 0 ~/.ssh/known_hosts
--' 2 31 /code/src/ruby_protobuf/.git/COMMIT_EDITMSG
--' 1 0 /code/src/ruby_protobuf/.git/COMMIT_EDITMSG
--' 1 0 /code/src/persona/config/database.yml
--' 1 137 ~/Desktop/hack.rb
--' 1 0 /code/src/atlas/.git/COMMIT_EDITMSG
--' 16 30 /code/src/abacus/.git/config
--' 14 7 /code/src/abacus/.git/config
--' 1 0 /code/src/abacus/.git/config
--' 1 54 /code/src/persona/.git/COMMIT_EDITMSG
--' 24 30 /code/src/persona/.git/config
--' 1 0 /code/src/persona/.git/config
--' 5 30 /code/src/persona/Gemfile
--' 1 0 /code/src/persona/Gemfile
--' 1 31 /code/src/amigo/.git/COMMIT_EDITMSG
--' 1 9 /code/src/trump/.rvmrc
--' 1 0 /code/src/tyrant/.git/COMMIT_EDITMSG
--' 1 0 /code/src/tyrant/.rvmrc
--' 1 9 /code/src/persona/.rvmrc
--' 1 22 /code/src/peon/.rvmrc
--' 1 9 /code/src/morannon/.rvmrc
--' 1 9 /code/src/ballista/.rvmrc
-
-# History of marks within files (newest to oldest):
-
-> ~/.oh-my-zsh/lib/aliases.zsh
- " 42 28
- ^ 42 29
- . 42 28
- + 33 0
- + 34 14
- + 32 15
- + 36 14
- + 34 0
- + 38 0
- + 37 0
- + 44 0
- + 41 21
- + 43 28
- + 42 28
-
-> /code/src/protobuf/.git/COMMIT_EDITMSG
- " 1 43
- ^ 1 44
- . 1 43
- + 1 43
-
-> /code/src/atlas/.bundle/config
- " 1 0
-
-> ~/.rspec
- " 2 2
- ^ 2 3
- . 2 2
- + 2 2
-
-> /private/etc/hosts
- " 8 28
- ^ 8 29
- . 8 28
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 8 0
- + 11 13
- + 11 0
- + 11 35
- + 11 0
- + 11 0
- + 11 8
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 0
- + 11 15
- + 11 35
- + 11 32
- + 11 0
- + 11 0
- + 10 0
- + 11 0
- + 8 0
- + 8 0
- + 10 0
- + 10 0
- + 10 0
- + 8 0
- + 8 0
- + 8 0
- + 10 0
- + 8 0
- + 11 0
- + 11 0
- + 11 12
- + 11 0
- + 11 0
- + 11 8
- + 11 0
- + 11 0
- + 10 0
- + 8 0
- + 11 0
- + 11 0
- + 11 81
- + 11 11
- + 11 0
- + 10 13
- + 8 0
- + 10 0
- + 8 0
- + 24 34
- + 10 0
- + 11 28
- + 11 38
- + 11 44
- + 11 0
- + 11 40
- + 11 42
- + 11 100
- + 11 46
- + 11 34
- + 10 18
- + 10 0
- + 11 0
- + 8 0
- + 11 13
- + 10 13
- + 8 12
- + 25 0
- + 11 14
- + 11 46
- + 11 0
- + 11 19
- + 11 11
- + 11 17
- + 11 60
- + 11 98
- + 10 103
- + 10 0
- + 10 100
- + 10 0
- + 11 55
- + 11 0
- + 10 0
- + 11 0
- + 8 51
- + 9 29
- + 8 28
-
-> ~/.ssh/config
- " 142 36
- ^ 142 37
- . 142 36
- + 109 0
- + 110 0
- + 111 0
- + 112 0
- + 111 0
- + 110 0
- + 109 0
- + 102 0
- + 3 0
- + 4 0
- + 5 0
- + 6 0
- + 7 0
- + 8 0
- + 9 0
- + 10 0
- + 11 0
- + 12 0
- + 13 0
- + 14 0
- + 15 0
- + 17 0
- + 18 0
- + 19 0
- + 20 0
- + 21 0
- + 22 0
- + 30 0
- + 31 0
- + 32 0
- + 33 0
- + 34 0
- + 35 0
- + 60 0
- + 61 0
- + 62 0
- + 63 0
- + 64 0
- + 65 0
- + 72 0
- + 73 0
- + 74 0
- + 75 0
- + 76 0
- + 84 0
- + 85 0
- + 86 0
- + 87 0
- + 88 0
- + 89 0
- + 90 0
- + 91 0
- + 92 0
- + 93 0
- + 94 0
- + 95 0
- + 96 0
- + 97 0
- + 98 0
- + 99 0
- + 100 0
- + 101 0
- + 30 0
- + 17 1
- + 66 10
- + 67 12
- + 68 16
- + 78 0
- + 77 0
- + 78 15
- + 79 15
- + 80 20
- + 97 4
- + 103 11
- + 104 11
- + 105 16
- + 36 0
- + 37 8
- + 38 18
- + 48 8
- + 49 10
- + 50 14
- + 54 0
- + 36 13
- + 54 15
- + 55 15
- + 56 20
- + 6 0
- + 17 36
- + 42 0
- + 43 5
- + 44 9
- + 22 0
- + 23 10
- + 24 12
- + 25 16
- + 28 13
- + 17 20
- + 17 0
- + 142 36
-
-> /code/src/paladin/.rvmrc
- " 1 29
- ^ 1 30
- . 1 29
- + 1 29
-
-> /code/src/peon/.git/COMMIT_EDITMSG
- " 1 0
-
-> ~/.zshrc
- " 24 210
- ^ 24 222
- . 24 221
- + 1 102
- + 6 27
- + 29 12
- + 33 0
- + 31 11
- + 28 8
- + 24 123
- + 32 0
- + 25 15
- + 27 0
- + 25 16
- + 26 25
- + 19 12
- + 24 177
- + 19 49
- + 24 171
- + 24 72
- + 24 221
-
-> ~/.gitconfig
- " 47 0
- ^ 29 18
- . 29 17
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 53 0
- + 42 9
- + 47 24
- + 34 0
- + 34 0
- + 35 33
- + 36 0
- + 31 0
- + 35 22
- + 34 20
- + 1 0
- + 24 24
- + 30 0
- + 10 17
- + 33 26
- + 23 0
- + 24 4
- + 25 0
- + 24 24
- + 25 3
- + 24 4
- + 23 20
- + 40 0
- + 36 24
- + 37 0
- + 36 15
- + 37 3
- + 26 2
- + 27 2
- + 28 2
- + 29 2
- + 26 17
- + 27 17
- + 28 17
- + 29 17
-
-> /code/src/zeus/.git/COMMIT_EDITMSG
- " 1 0
-
-> /code/src/ballista/.git/COMMIT_EDITMSG
- " 1 41
- ^ 1 42
- . 1 41
- + 1 41
-
-> ~/.ssh/known_hosts
- " 32 5
- . 166 0
- + 3 0
- + 8 0
- + 3 0
- + 8 0
- + 3 0
- + 8 0
- + 3 0
- + 8 0
- + 22 0
- + 3 0
- + 8 0
- + 22 0
- + 46 0
- + 90 0
- + 44 0
- + 83 0
- + 78 0
- + 91 0
- + 20 0
- + 28 0
- + 44 0
- + 111 0
- + 95 0
- + 111 0
- + 95 0
- + 167 0
- + 157 0
- + 166 0
-
-> ~/mm.cfg
- " 1 0
-
-> ~/Desktop/institution_guids.txt
- " 1 0
- ^ 1 1
- . 1 0
- + 1 0
- + 1 437579
- + 1 0
-
-> /code/src/trebuchet/.git/COMMIT_EDITMSG
- " 1 0
- ^ 2 52
- . 2 52
- + 2 52
-
-> ~/.trebrc
- " 16 9
- ^ 16 10
- . 17 0
- + 17 0
-
-> /private/tmp/system/a
- " 1 1
- ^ 1 2
- . 1 1
- + 1 1
-
-> /code/src/parrot/.gitignore
- " 1 8
- ^ 1 9
- . 1 8
- + 1 8
-
-> /code/src/ballista/.gitignore
- " 19 12
- ^ 19 13
- . 19 12
- + 16 16
- + 14 0
- + 18 13
- + 19 12
-
-> ~/.vimrc
- " 1 0
- ^ 43 5
- . 43 4
- + 43 16
- + 44 21
- + 43 4
-
-> /code/src/bullseye/config/database.yml
- " 1 0
-
-> ~/errbit_cleanup
- " 2 34
- ^ 2 35
- . 2 34
- + 1 10
- + 2 34
-
-> /code/src/paladin/package.json
- " 12 32
- ^ 12 33
- . 12 32
- + 12 32
-
-> /code/src/paladin/.git/COMMIT_EDITMSG
- " 1 41
- . 1 40
- + 1 40
-
-> /code/src/jefe/config/database.yml
- " 1 0
-
-> /code/src/jefe/.gitignore
- " 7 13
- ^ 7 14
- . 7 13
- + 3 6
- + 7 13
-
-> /code/src/jefe/.git/config
- " 13 13
- ^ 13 14
- . 13 13
- + 11 15
- + 10 16
- + 13 13
-
-> /code/src/toolbox/.rvmrc
- " 1 0
- . 1 9
- + 1 9
-
-> /code/src/amigo/Gemfile
- " 40 0
- ^ 26 29
- . 40 0
- + 22 0
- + 22 0
- + 13 22
- + 26 27
- + 22 0
- + 40 0
-
-> /code/src/abacus/.rvmrc
- " 1 0
- ^ 1 25
- . 1 24
- + 1 24
-
-> /code/src/ruby_protobuf/.git/COMMIT_EDITMSG
- " 2 31
- ^ 2 32
- . 2 31
- + 1 68
- + 2 31
-
-> /code/src/persona/config/database.yml
- " 1 0
-
-> ~/Desktop/hack.rb
- " 1 137
- ^ 1 138
- . 1 137
- + 1 137
-
-> /code/src/atlas/.git/COMMIT_EDITMSG
- " 1 0
-
-> /code/src/abacus/.git/config
- " 16 30
- ^ 16 31
- . 16 30
- + 14 19
- + 16 30
-
-> /code/src/persona/.git/COMMIT_EDITMSG
- " 1 54
- ^ 1 55
- . 1 54
- + 1 54
-
-> /code/src/persona/.git/config
- " 24 30
- ^ 24 31
- . 24 30
- + 22 19
- + 24 30
-
-> /code/src/persona/Gemfile
- " 5 30
- ^ 4 25
- . 5 30
- + 17 0
- + 18 0
- + 23 32
- + 22 33
- + 25 20
- + 18 33
- + 19 0
- + 4 24
- + 5 30
-
-> /code/src/amigo/.git/COMMIT_EDITMSG
- " 1 31
- . 1 31
- + 1 31
-
-> /code/src/trump/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/tyrant/.git/COMMIT_EDITMSG
- " 1 0
-
-> /code/src/tyrant/.rvmrc
- " 1 0
- . 1 9
- + 1 9
-
-> /code/src/persona/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/peon/.rvmrc
- " 1 22
- ^ 1 24
- . 1 22
- + 1 22
-
-> /code/src/morannon/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/ballista/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/amigo/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/newman/.rvmrc
- " 1 9
- . 1 9
- + 1 9
-
-> /code/src/trebuchet/.git/config
- " 13 13
- ^ 13 14
- . 13 13
- + 13 13
-
-> /code/src/paladin/test/router.json
- " 1 95
- ^ 1 96
- . 1 95
- + 1 95
-
-> /code/src/blinky/.rvmrc
- " 1 9
- ^ 1 21
- . 1 9
- + 1 9
-
-> /code/src/trebuchet/.gitignore
- " 5 8
- ^ 5 9
- . 5 8
- + 5 8
-
-> /code/src/ruby_protobuf/.gitignore
- " 5 0
- ^ 5 1
- . 5 0
- + 4 5
- + 5 0
-
-> ~/Desktop/accounts/reduction.out
- " 1 146869
-
-> ~/.thor/thor.yml
- " 1 0
-
-> ~/Desktop/member_guids.yml
- " 8850 0
- . 1 41
- + 1 41
-
-> ~/Desktop/member_guids
- " 1 0
- ^ 1 2
- . 2 0
- + 1 52
- + 8850 42
- + 1 0
- + 8850 42
- + 1 0
- + 8850 42
- + 8851 0
- + 1 63
- + 8851 2
- + 1 70
- + 8851 12
- + 1 1
- + 8851 0
- + 1 18
- + 8851 1
- + 1 0
- + 2 0
- + 8851 0
- + 1 1
- + 2 0
-
-> ~/Desktop/Gemfile
- " 3 0
- . 4 0
- + 1 6
- + 2 11
- + 4 0
-
-> ~/.rvm/gems/ruby-1.9.2-p0@mongo/specifications/mongodb-0.0.7.gemspec
- " 9 24
- ^ 9 32
- . 9 24
- + 9 24
-
-> ~/.rvm/gems/ruby-1.9.2-p0@morannon/specifications/mongodb-0.0.7.gemspec
- " 9 2
- . 9 0
- + 9 0
-
-> ~/Desktop/query.rb
- " 11 2
- ^ 11 3
- . 11 0
- + 3 57
- + 1 22
- + 3 0
- + 9 10
- + 7 50
- + 9 137
- + 9 5
- + 11 0
-
-> ~/Desktop/query.js
- " 8852 0
-
-> ~/Desktop/accounts/persona_member_guids.csv
- " 1 0
- ^ 2 18
- . 2 0
- + 1 1
- + 8738 0
- + 1 39
- + 2 0
-
-> ~/Desktop/accounts/postgres-Wednesday31.pgdump
- " 212 42
- . 835287 0
- + 15 0
- + 16 0
- + 26 0
- + 30 0
- + 835287 0
- + 835287 0
- + 835287 0
- + 835287 0
- + 835287 0
- + 835287 0
-
-> ~/Desktop/member_guids_hcu.txt
- " 8703 0
- . 1 0
- + 1 0
-
-> /code/src/paladin/.git/config
- " 13 13
- ^ 13 14
- . 14 0
- + 14 0
-
-> ~/Desktop/paired_mobile_device_users-8-30-2011.cls
- " 48 82
-
-> ~/Library/Mail Downloads/user_list.csv
- " 12 39
-
-> /code/src/abacus/config/database.yml
- " 1 0
-
-> ~/blah
- " 2 0
- ^ 2 0
- . 1 335676
- + 1 335676
-
-> /usr/local/Cellar/mongodb/1.6.3-x86_64/mongod.conf
- " 5 18
- ^ 5 19
- . 5 18
- + 5 18
-
-> ~/.rvm/gems/ruby-1.9.2-p0@abacus/specifications/childprocess-0.2.1.gemspec
- " 9 2
- . 9 0
- + 9 0
-
-> /code/src/chainsaw/.gitignore
- " 3 8
- ^ 3 9
- . 3 8
- + 2 9
- + 3 8
-
-> /code/src/amigo/.gitignore
- " 14 0
- . 15 0
- + 7 10
- + 13 9
- + 13 0
- + 15 0
-
-> /code/src/chainsaw/.git/config
- " 9 33
- . 9 33
- + 9 33
-
-> /code/src/paladin/config/router.sample.json
- " 1 0
-
-> ~/Desktop/node_install.txt
- " 67 0
- ^ 67 48
- . 67 47
- + 1 4
- + 1 0
- + 1 0
- + 1 6
- + 1 47
- + 2 30
- + 9 4
- + 9 0
- + 1 8
- + 1 0
- + 2 0
- + 2 0
- + 2 0
- + 9 0
- + 29 0
- + 9 0
- + 9 0
- + 2 29
- + 9 0
- + 15 0
- + 1 8
- + 15 12
- + 17 11
- + 9 46
- + 14 0
- + 30 21
- + 42 0
- + 10 51
- + 14 0
- + 28 17
- + 18 0
- + 28 0
- + 19 44
- + 41 31
- + 2 16
- + 3 40
- + 8 11
- + 10 12
- + 41 9
- + 41 51
- + 28 4
- + 12 30
- + 45 18
- + 64 0
- + 55 0
- + 51 26
- + 44 7
- + 46 15
- + 51 23
- + 66 52
- + 25 13
- + 27 41
- + 22 55
- + 20 42
- + 23 32
- + 22 3
- + 21 8
- + 23 43
- + 24 0
- + 23 10
- + 24 37
- + 26 0
- + 67 47
-
-> /code/src/paladin/.gitignore
- " 6 16
- ^ 6 17
- . 6 16
- + 1 0
- + 1 11
- + 2 4
- + 3 11
- + 6 16
-
-> /code/src/paladin/.gitconfig
- " 1 0
-
-> ~/.rvm/gems/ruby-1.9.2-p0@amigo/specifications/resque_spec-0.7.0.gemspec
- " 9 2
- . 9 0
- + 9 0
-
-> /code/src/amigo/config/resque.yml
- " 1 0
-
-> /usr/local/etc/redis.conf
- " 1 0
-
-> /code/src/amigo/config/mongoid.yml
- " 1 0
-
-> ~/.rvm/gems/ruby-1.9.2-p0@amigo/specifications/childprocess-0.2.1.gemspec
- " 9 2
- . 9 0
- + 9 0
-
-> ~/.rvm/gems/ruby-1.9.2-p0@morannon/specifications/childprocess-0.2.1.gemspec
- " 9 2
- . 9 0
- + 9 0
-
-> /code/src/atlas/Gemfile.lock
- " 1 0
-
-> /code/src/paladin/paladin.pid
- " 1 0
-
-> /code/src/paladin/lib/rules.json
- " 7 106
- ^ 7 107
- . 7 106
- + 9 100
- + 9 0
- + 9 0
- + 7 106
-
-> /code/src/flex/.git/config
- " 1 0
- ^ 16 26
- . 16 25
- + 14 14
- + 16 25
-
-> ~/deploy.sh
- " 1 6
- ^ 1 7
- . 1 6
- + 1 6
-
-> ~/deploy.txt
- " 5 22
- ^ 5 23
- . 5 22
- + 1 14
- + 5 22
-
-> /code/src/abacus/.git/TAG_EDITMSG
- " 1 26
- ^ 1 27
- . 1 26
- + 2 0
- + 1 26
-
-> ~/.oh-my-zsh/lib/functions.zsh
- " 109 18
- ^ 109 19
- . 109 18
- + 41 0
- + 42 98
- + 44 38
- + 46 76
- + 48 46
- + 71 90
- + 71 0
- + 49 51
- + 53 0
- + 54 0
- + 50 13
- + 52 82
- + 52 12
- + 52 71
- + 54 0
- + 69 0
- + 56 12
- + 57 61
- + 60 2
- + 59 2
- + 60 4
- + 61 125
- + 59 0
- + 62 34
- + 63 40
- + 64 17
- + 57 19
- + 68 31
- + 58 0
- + 119 0
- + 71 0
- + 70 0
- + 41 0
- + 114 0
- + 106 19
- + 118 0
- + 117 61
- + 112 0
- + 109 18
-
-> ~/.bashrc
- " 1 0
-
-> /code/src/paladin/em-proxy/em-proxy.gemspec
- " 1 0
-
-> /code/src/paladin/em-proxy/Gemfile
- " 1 0
-
-> /code/src/persona/config/mongoid.yml.sample
- " 1 0
-
-> .ssh/config
- " 1 0
-
-> /code/src/abacus/.gitignore
- " 20 12
- ^ 20 13
- . 20 12
- + 20 12

0 comments on commit 54854af

Please sign in to comment.
Something went wrong with that request. Please try again.