merge with stable
Showing
- hgext/rebase.py 9 additions, 4 deletionshgext/rebase.py
- mercurial/help/config.txt 1 addition, 1 deletionmercurial/help/config.txt
- mercurial/revset.py 9 additions, 5 deletionsmercurial/revset.py
- tests/failfilemerge.py 18 additions, 0 deletionstests/failfilemerge.py
- tests/test-glog.t 24 additions, 39 deletionstests/test-glog.t
- tests/test-rebase-abort.t 72 additions, 0 deletionstests/test-rebase-abort.t
- tests/test-revset.t 24 additions, 22 deletionstests/test-revset.t
Loading
Please register or sign in to comment