merging at e44a5cc ⋅ jupyter/nbdime

Files		•	•	•	Coverage
__init__.py	4	4	0	0	100.00%
autoresolve.py	59	0	0	59	0.00%
chunks.py	90	77	0	13	85.56%
decisions.py	365	304	0	61	83.29%
generic.py	342	261	0	81	76.32%
notebooks.py	76	76	0	0	100.00%
strategies.py	399	327	0	72	81.95%
Folder Totals (7 files)	1,335	1,049	0	286	78.58%
Project Totals (97 files)	10,075	6,507	223	3,345	64.59%

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits