#author("2020-10-02T08:04:27+00:00","","") #author("2020-10-02T08:05:12+00:00","","") #topicpath /////////////////////////////////////////////////////////////////////////////// * 目次 [#b11f3e0f] #contents(); /////////////////////////////////////////////////////////////////////////////// * diff と patch [#c9b857df] /////////////////////////////////////////////////////////////////////////////// * 使い方 [#hb921c34] * diff と patch の使い方 [#hb921c34] //============================================================================= ** diff を取って patch を当てる [#pd74a4bc] + <file-1> と <file-2> の間の差分を取り、<diff-file> に出力する $ diff -u <file-1> <file-2> > <diff-file> + <file-1> を基準とした <file-2> の差分を <target-file> に適用する $ patch <target-file> < <diff-file> //-----------------------------------------------------------------------------