tests/test-inotify
branchstable
changeset 10944 6f1894d6a6b0
parent 9900 8939900073a8
child 11545 db9d16233787
equal deleted inserted replaced
10942:6f26ce7ae175 10944:6f1894d6a6b0
    80 hg st
    80 hg st
    81 
    81 
    82 echo c >> a
    82 echo c >> a
    83 hg st
    83 hg st
    84 
    84 
    85 hg up 0
    85 HGMERGE=internal:local hg up 0
    86 hg st
    86 hg st
    87 
    87 
    88 HGMERGE=internal:local hg up
    88 HGMERGE=internal:local hg up
    89 hg st
    89 hg st
    90 
    90