equal
deleted
inserted
replaced
149 popping url.diff |
149 popping url.diff |
150 patch queue now empty |
150 patch queue now empty |
151 |
151 |
152 build diff with CRLF |
152 build diff with CRLF |
153 |
153 |
154 $ python ../writelines.py b 5 'a\n' 5 'a\r\n' |
154 $ $PYTHON ../writelines.py b 5 'a\n' 5 'a\r\n' |
155 $ hg ci -Am addb |
155 $ hg ci -Am addb |
156 adding b |
156 adding b |
157 $ python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
157 $ $PYTHON ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n' |
158 $ hg diff > b.diff |
158 $ hg diff > b.diff |
159 $ hg up -C |
159 $ hg up -C |
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 |
161 |
162 qimport CRLF diff |
162 qimport CRLF diff |