Merge pull request #248 from elig0n/diff_pgup_ctrlu

author Mischievous Meerkat <engineerarun@gmail.com>

Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)

committer GitHub <noreply@github.com>

Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)
author Mischievous Meerkat <engineerarun@gmail.com>
Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)
committer GitHub <noreply@github.com>
Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)
diff --cc src/nnn.c
Simple merge
diff --cc src/nnn.h
Simple merge
author	Mischievous Meerkat <engineerarun@gmail.com>
	Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)
committer	GitHub <noreply@github.com>
	Sat, 20 Apr 2019 20:40:11 +0000 (02:10 +0530)
		1	2
src/nnn.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nnn.h	patch \|	diff1 \|	diff2 \|	blob \| history