equal
deleted
inserted
replaced
253 merging file2 |
253 merging file2 |
254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
254 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
255 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark') |
256 [1] |
256 [1] |
257 $ ls .hg/origbackups |
257 $ ls .hg/origbackups |
258 file1.orig |
258 file1 |
259 file2.orig |
259 file2 |
260 $ grep '<<<' file1 > /dev/null |
260 $ grep '<<<' file1 > /dev/null |
261 $ grep '<<<' file2 > /dev/null |
261 $ grep '<<<' file2 > /dev/null |
262 |
262 |
263 resolve <file> should re-merge file |
263 resolve <file> should re-merge file |
264 $ echo resolved > file1 |
264 $ echo resolved > file1 |