equal
deleted
inserted
replaced
347 $ hg graft 7 |
347 $ hg graft 7 |
348 skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f) |
348 skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f) |
349 [255] |
349 [255] |
350 |
350 |
351 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 |
351 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 |
352 --- */hg-5c095ad7e90f.patch * +0000 (glob) |
352 --- */hg-5c095ad7e90f.patch * (glob) |
353 +++ */hg-7a4785234d87.patch * +0000 (glob) |
353 +++ */hg-7a4785234d87.patch * (glob) |
354 @@ -1,18 +1,18 @@ |
354 @@ -1,18 +1,18 @@ |
355 # HG changeset patch |
355 # HG changeset patch |
356 -# User test |
356 -# User test |
357 +# User foo |
357 +# User foo |
358 # Date 0 0 |
358 # Date 0 0 |
378 -+b |
378 -+b |
379 ++a |
379 ++a |
380 [1] |
380 [1] |
381 |
381 |
382 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 -X . |
382 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 -X . |
383 --- */hg-5c095ad7e90f.patch * +0000 (glob) |
383 --- */hg-5c095ad7e90f.patch * (glob) |
384 +++ */hg-7a4785234d87.patch * +0000 (glob) |
384 +++ */hg-7a4785234d87.patch * (glob) |
385 @@ -1,8 +1,8 @@ |
385 @@ -1,8 +1,8 @@ |
386 # HG changeset patch |
386 # HG changeset patch |
387 -# User test |
387 -# User test |
388 +# User foo |
388 +# User foo |
389 # Date 0 0 |
389 # Date 0 0 |