Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible...

author Pratyush Yadav <redacted>

Thu, 19 Sep 2019 17:52:03 +0000 (23:22 +0530)

committer Pratyush Yadav <redacted>

Tue, 24 Sep 2019 14:17:43 +0000 (19:47 +0530)
author Pratyush Yadav <redacted>
Thu, 19 Sep 2019 17:52:03 +0000 (23:22 +0530)
committer Pratyush Yadav <redacted>
Tue, 24 Sep 2019 14:17:43 +0000 (19:47 +0530)
diff --cc Makefile
Simple merge
diff --cc git-gui.sh
Simple merge
diff --cc lib/commit.tcl
Simple merge
diff --cc lib/diff.tcl
Simple merge
author	Pratyush Yadav <redacted>
	Thu, 19 Sep 2019 17:52:03 +0000 (23:22 +0530)
committer	Pratyush Yadav <redacted>
	Tue, 24 Sep 2019 14:17:43 +0000 (19:47 +0530)
		1	2	3	4	5	6	7	8	9	10
Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
git-gui.sh	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
lib/commit.tcl	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history
lib/diff.tcl	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	blob \| history