Ok Seems to be working. First commit on this file had a lot of modification due to applying automatic Eclipse indentation on File.