NoMethodError in MemochonController#update You have a nil object when you didn't expect it! You might have expected an instance of Array. The error occurred while evaluating nil.[]= /usr/lib/ruby/gems/1.8/gems/activerecord-1.15.3/lib/activ…

いつも、ふと忘れてしまうのでメモ。 # mergemaster -siva # mergemaster -sivrm(erge)選択時の操作… l 左側を採用（古い方） r 右側を採用（新しい方）