added a line for first change in non-fast-forward repro case
modified a line for second change in non-fast-forward repro case
deleted a line for third change in non-fast-forward repro case
Merge branch 'master' of github.com:sbijoshj/gitXperiment