]> scripts.mit.edu Git - wizard.git/commit
scripts.mit.edu / wizard.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ee81a75) | patch
Don't discard our changes! Also, better debugging info.
authorEdward Z. Yang <ezyang@mit.edu>
Sat, 23 Jul 2011 09:47:49 +0000 (05:47 -0400)
committerEdward Z. Yang <ezyang@mit.edu>
Sat, 23 Jul 2011 09:47:49 +0000 (05:47 -0400)
commitcc71cb0999ab12b5d053afeca537f7fefbb7accb
tree97bb71df3e5f529b0d809599c4bb6b3809c12daatree | snapshot
parentee81a755e902dc95fafa440f1c40b3dd8a703478commit | diff
Don't discard our changes! Also, better debugging info.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
wizard/merge.py diff | blob | history
Wizard web application autoinstaller framework