Merge pull request #3101 from nrc/pair-newline

author Nick Cameron <nrc@ncameron.org>

Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)

committer GitHub <noreply@github.com>

Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)
author Nick Cameron <nrc@ncameron.org>
Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)
committer GitHub <noreply@github.com>
Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)
diff --cc src/expr.rs
Simple merge
diff --cc src/string.rs
Simple merge
diff --cc src/utils.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)
committer	GitHub <noreply@github.com>
	Mon, 15 Oct 2018 20:01:40 +0000 (09:01 +1300)
		1	2
src/expr.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/string.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history