Update submodules and merge/diff tool alias on linux