Merge branch 'master' of git://iolanguage.com/Io
[io.git] / gitRemoveConflicts
bloba38e9fda92de7850c7d0dd117bf3bc16c0c515b3
1 git ls-files -u | awk '{print $4}' | git update-index --stdin