Merge incoming fix.
No related branches found
No related tags found
Showing
- hggit/__init__.py 6 additions, 5 deletionshggit/__init__.py
- hggit/git_handler.py 24 additions, 8 deletionshggit/git_handler.py
- tests/test-conflict-1.out 0 additions, 3 deletionstests/test-conflict-1.out
- tests/test-conflict-2.out 0 additions, 3 deletionstests/test-conflict-2.out
- tests/test-convergedmerge.out 0 additions, 3 deletionstests/test-convergedmerge.out
- tests/test-empty-working-tree.out 0 additions, 2 deletionstests/test-empty-working-tree.out
- tests/test-encoding.out 0 additions, 3 deletionstests/test-encoding.out
- tests/test-file-removal.out 0 additions, 3 deletionstests/test-file-removal.out
- tests/test-git-clone.out 0 additions, 3 deletionstests/test-git-clone.out
- tests/test-git-submodules.out 0 additions, 3 deletionstests/test-git-submodules.out
- tests/test-git-tags.out 0 additions, 3 deletionstests/test-git-tags.out
- tests/test-git-workflow 1 addition, 0 deletionstests/test-git-workflow
- tests/test-git-workflow.out 1 addition, 0 deletionstests/test-git-workflow.out
- tests/test-hg-author.out 0 additions, 5 deletionstests/test-hg-author.out
- tests/test-hg-branch.out 0 additions, 5 deletionstests/test-hg-branch.out
- tests/test-hg-tags.out 0 additions, 5 deletionstests/test-hg-tags.out
- tests/test-merge.out 0 additions, 3 deletionstests/test-merge.out
- tests/test-octopus.out 0 additions, 3 deletionstests/test-octopus.out
- tests/test-outgoing.out 0 additions, 5 deletionstests/test-outgoing.out
- tests/test-pull-after-strip.out 0 additions, 8 deletionstests/test-pull-after-strip.out
Loading
Please register or sign in to comment