Refactor to do diff per commit and only show conflicted changes in merges.
authorStephen Haberman <stephen@exigencecorp.com>
Fri, 22 Aug 2008 12:28:06 +0000 (07:28 -0500)
committerStephen Haberman <stephen@exigencecorp.com>
Fri, 22 Aug 2008 12:28:06 +0000 (07:28 -0500)
commitc3124d06fdf86e07d1e2357a010e2a621647af58
tree8a99f21970a888221fe306fbaef1d6ea3f728d8e
parenta88281f07f9075499e20fc7238acd625938b01d3
Refactor to do diff per commit and only show conflicted changes in merges.
22 files changed:
server/functions
server/post-receive-email
tests/t2200-1.txt
tests/t2200-server-post-receive-email.sh
tests/t2201-1.txt
tests/t2201-2.txt
tests/t2201-3.txt
tests/t2201-4.txt
tests/t2201-5.txt
tests/t2201-6.txt
tests/t2201-7.txt
tests/t2201-8.txt
tests/t2201-server-post-receive-email-tags.sh
tests/t2202-1.txt
tests/t2202-3.txt
tests/t2202-4.txt
tests/t2202-5.txt
tests/t2202-6.txt
tests/t2202-server-post-receive-email-branches.sh
tests/t2203-1.txt
tests/t2203-2.txt
tests/t2203-server-post-receive-email-stable.sh