Published onFebruary 24, 2009Better git conflict resolution between binaries with ---theirs and ---oursgit