]> scripts.mit.edu Git - wizard.git/commit
scripts.mit.edu / wizard.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d8b7d9c) | patch
Add some automatic resolutions for whole-file.
authorEdward Z. Yang <ezyang@mit.edu>
Sat, 6 Feb 2010 08:29:07 +0000 (03:29 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Sat, 6 Feb 2010 08:29:12 +0000 (03:29 -0500)
commit9a61704419ef8694e68055ecad935a89f2203d78
tree4019da57fe87779089a43d6e33bd7d935ca0f0c9tree | snapshot
parentd8b7d9cbe7facd47d5b3b87b949f3b70c4d9f32ccommit | diff
Add some automatic resolutions for whole-file.

* If common and theirs are present, but ours isn't, don't
  include ours.
* If theirs is present, but common and ours isn't, add theirs.

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