equal
deleted
inserted
replaced
205 +Apple |
205 +Apple |
206 |
206 |
207 Getting rid of branchy history |
207 Getting rid of branchy history |
208 ---------------------------------- |
208 ---------------------------------- |
209 |
209 |
210 While I was working on my list. someone made a change remotly. |
210 While I was working on my list. someone made a change remotely. |
211 |
211 |
212 $ cd ../remote |
212 $ cd ../remote |
213 $ hg up -q |
213 $ hg up -q |
214 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping |
214 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping |
215 $ hg ci -m 'SPAM' |
215 $ hg ci -m 'SPAM' |