Properly return -1 on unresolved conflict
authorAndrew Young <youngar17@gmail.com>
Mon, 13 Aug 2012 15:30:22 +0000 (11:30 -0400)
committerAndrew Young <youngar17@gmail.com>
Mon, 13 Aug 2012 15:30:22 +0000 (11:30 -0400)
commitd19a3ff027fd49244795dbab19f97790c80ad56f
tree6ed0441bb6d8ddedbb72ed2f516c565086cf46a5
parentda1e23962863b267df2ecd5ccf6caa4553cdca33
Properly return -1 on unresolved conflict
src/main.c
src/print.c
src/print_ctxt.c
src/print_ctxt.h