equal
deleted
inserted
replaced
719 |
719 |
720 $ hg --config extensions.extdiff= extdiff -S |
720 $ hg --config extensions.extdiff= extdiff -S |
721 |
721 |
722 $ hg --config extensions.extdiff= extdiff -r '.^' -S |
722 $ hg --config extensions.extdiff= extdiff -r '.^' -S |
723 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
723 diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
724 --- cloned.*/.hgsub * +0000 (glob) |
724 --- cloned.*/.hgsub * (glob) |
725 +++ cloned/.hgsub * +0000 (glob) |
725 +++ cloned/.hgsub * (glob) |
726 @@ -1,2 +1 @@ |
726 @@ -1,2 +1 @@ |
727 sub1 = ../sub1 |
727 sub1 = ../sub1 |
728 -sub3 = sub3 |
728 -sub3 = sub3 |
729 diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
729 diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
730 --- cloned.*/.hgsubstate * +0000 (glob) |
730 --- cloned.*/.hgsubstate * (glob) |
731 +++ cloned/.hgsubstate * +0000 (glob) |
731 +++ cloned/.hgsubstate * (glob) |
732 @@ -1,2 +1 @@ |
732 @@ -1,2 +1 @@ |
733 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
733 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
734 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
734 -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
735 [1] |
735 [1] |
736 |
736 |