Got rid of git ediff code that did not work