git.samba.org / jelmer / dulwich.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 554de5d a7659f4)
Merge remote-tracking branch 'comet-ml/line-ending-convert-support' master bitbucket/master github/master
authorJelmer Vernooij <jelmer@jelmer.uk>
Tue, 15 Jan 2019 20:10:14 +0000 (20:10 +0000)
committerJelmer Vernooij <jelmer@jelmer.uk>
Tue, 15 Jan 2019 20:10:14 +0000 (20:10 +0000)
1  2 
dulwich/porcelain.py patch | diff1 | diff2 | blob | history

diff --cc dulwich/porcelain.py
Simple merge
Pure-python implementation of the Git file formats and protocols.