projects / another_project.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba9d671 3f3b901)
Reverse merge to resolve out-of-date conflicts
authorjordanmccullough <jordan@github.com>
Tue, 24 Sep 2013 19:52:51 +0000 (13:52 -0600)
committerjordanmccullough <jordan@github.com>
Tue, 24 Sep 2013 19:52:51 +0000 (13:52 -0600)

Trivial merge
Public project demonstrating something