Merge pull request #2847 from hiroponz/improve-overlap-lines

author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)

committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)
diff --cc lib/gitlab/graph/json_builder.rb
Simple merge
diff --cc vendor/assets/javascripts/branch-graph.js
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)
		1	2
lib/gitlab/graph/json_builder.rb	patch \|	diff1 \|	diff2 \|	blob \| history
vendor/assets/javascripts/branch-graph.js	patch \|	diff1 \|	diff2 \|	blob \| history