]> git.droids-corp.org - git-central.git/commit
git.droids-corp.org / git-central.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 21d1ac9) | patch
Test how merges with and without conflicts are currently rendered.
authorStephen Haberman <stephen@exigencecorp.com>
Thu, 21 Aug 2008 06:19:33 +0000 (01:19 -0500)
committerStephen Haberman <stephen@exigencecorp.com>
Thu, 21 Aug 2008 06:19:33 +0000 (01:19 -0500)
commit377377985ec7dffc8b7414d42fea98b1145b19f5
tree1aca4060d582a1a0ae9b37aaf9a4b9827dd43c5ftree | snapshot
parent21d1ac9e195c8c5448fc1084ea941d6cbfa4f8b5commit | diff
Test how merges with and without conflicts are currently rendered.
tests/t2203-1.txt [new file with mode: 0644] blob
tests/t2203-2.txt [new file with mode: 0644] blob
tests/t2203-server-post-receive-email-stable.sh [new file with mode: 0644] blob
scripts and hooks for use with a centralized git repo