Update the flow inside the conflicter so it works with 'diff' option
Merge pull request #298 from SBoudrias/conflicter

Fix async flow when diffing a file (Fix #291)