Merge branch 'master' of git://iolanguage.com/Io
[io.git] / gitShowConflicts
blobed613ed5b1067463532d502bfd4560863b2291f9
1 git ls-files -u | awk '{print $4}'