tests/test-topic-stack.t
branchmercurial-5.0
changeset 4777 ff452675566c
parent 4712 e2c548cc83b5
child 4782 8fcdf221b046
child 4863 5cd7d16b8733
equal deleted inserted replaced
4776:d93fef4b98df 4777:ff452675566c
   938   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   938   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   939   adding Z
   939   adding Z
   940   adding ggg
   940   adding ggg
   941   diff --git a/Z b/Z
   941   diff --git a/Z b/Z
   942   new file mode 100644
   942   new file mode 100644
   943   examine changes to 'Z'?
   943   examine changes to 'Z'? [Ynesfdaq?] y
   944   (enter ? for help) [Ynesfdaq?] y
       
   945   
   944   
   946   @@ -0,0 +1,1 @@
   945   @@ -0,0 +1,1 @@
   947   +zzz
   946   +zzz
   948   record change 1/2 to 'Z'?
   947   record change 1/2 to 'Z'? [Ynesfdaq?] y
   949   (enter ? for help) [Ynesfdaq?] y
       
   950   
   948   
   951   diff --git a/ggg b/ggg
   949   diff --git a/ggg b/ggg
   952   new file mode 100644
   950   new file mode 100644
   953   examine changes to 'ggg'?
   951   examine changes to 'ggg'? [Ynesfdaq?] n
   954   (enter ? for help) [Ynesfdaq?] n
       
   955   
   952   
   956   continue splitting? [Ycdq?] c
   953   continue splitting? [Ycdq?] c
   957 
   954 
   958   $ hg --config extensions.evolve= obslog --all
   955   $ hg --config extensions.evolve= obslog --all
   959   o  dde94df880e9 (21) c_G
   956   o  dde94df880e9 (21) c_G