equal
deleted
inserted
replaced
245 remote turned local largefile large2 into a normal file |
245 remote turned local largefile large2 into a normal file |
246 keep (l)argefile or use (n)ormal file? l |
246 keep (l)argefile or use (n)ormal file? l |
247 $ hg debugdirstate --nodates | grep large2 |
247 $ hg debugdirstate --nodates | grep large2 |
248 a 0 -1 .hglf/large2 |
248 a 0 -1 .hglf/large2 |
249 r 0 0 large2 |
249 r 0 0 large2 |
|
250 $ hg status -A large2 |
|
251 A large2 |
250 $ cat large2 |
252 $ cat large2 |
251 modified large2 for linear merge |
253 modified large2 for linear merge |
252 |
254 |
253 (added largefile is already committed as normal) |
255 (added largefile is already committed as normal) |
254 |
256 |
259 remote turned local largefile large3 into a normal file |
261 remote turned local largefile large3 into a normal file |
260 keep (l)argefile or use (n)ormal file? l |
262 keep (l)argefile or use (n)ormal file? l |
261 $ hg debugdirstate --nodates | grep large3 |
263 $ hg debugdirstate --nodates | grep large3 |
262 a 0 -1 .hglf/large3 |
264 a 0 -1 .hglf/large3 |
263 r 0 0 large3 |
265 r 0 0 large3 |
|
266 $ hg status -A large3 |
|
267 A large3 |
264 $ cat large3 |
268 $ cat large3 |
265 large3 as large file for linear merge |
269 large3 as large file for linear merge |
266 |
270 |
267 $ cd .. |
271 $ cd .. |