]> scripts.mit.edu Git - wizard.git/commit
scripts.mit.edu / wizard.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98af845) | patch
Use diff3 conflict style, which gives more information.
authorEdward Z. Yang <ezyang@mit.edu>
Tue, 22 Dec 2009 22:09:54 +0000 (17:09 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Tue, 22 Dec 2009 22:09:54 +0000 (17:09 -0500)
commit523af9325474d8be6ec72958e38cd460beaf5615
tree250c15c5345912357dbd8abbbbe13a3da22050d7tree | snapshot
parent98af8454c63eac3d49414275111c2e44addf81e6commit | diff
Use diff3 conflict style, which gives more information.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
TODO diff | blob | history
wizard/command/upgrade.py diff | blob | history
wizard/resolve.py diff | blob | history
wizard/tests/resolve_test.py diff | blob | history
Wizard web application autoinstaller framework