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