git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e30fb0 a115daf)
Merge branch 'maint'
authorJ. Bruce Fields <redacted>
Sun, 26 Aug 2007 14:36:38 +0000 (10:36 -0400)
committerJ. Bruce Fields <redacted>
Sun, 26 Aug 2007 14:36:38 +0000 (10:36 -0400)
Conflicts:

Documentation/user-manual.txt

1  2 
Documentation/user-manual.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/user-manual.txt
Simple merge
git clone https://git.99rst.org/PROJECT