| commit | 04b0c3c8e54aed95e917ec9214555666687f466e | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Thu May 19 14:13:42 2016 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Thu May 19 14:13:42 2016 +0200 |
| tree | 0d49dd6b11a632a26a2da9ccccf93c76560c8d7c | |
| parent | 2600a46ee0ed57c0e0a382c2a37ebac64d374d20 [diff] | |
| parent | 9842df62004f366b9fed2423e24df10542ee0dc5 [diff] |
sample merge resolution