| commit | 3d95098c7b1b3bc749bf172600778a5ef96b5966 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 15 Aug 2009 21:06:54 +0000 (15 14:06 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Sat, 15 Aug 2009 21:06:54 +0000 (15 14:06 -0700) | ||
| tree | cc23307a538f332d068e1b3bccda12a2b47edf5b | treesnapshot (tar.gz zip) |
| parent | 1517d8c95a002ba6c1d3572435517487441e3c5a | commitdiff |
cola.controllers.merge: Integrate the new MergeView
This replaces the .ui-based MergeView with the new one provided
by cola.views.merge. This also moves some code from the
controller into the view where it rightfully belongs.
Signed-off-by: David Aguilar <davvid@gmail.com>
This replaces the .ui-based MergeView with the new one provided
by cola.views.merge. This also moves some code from the
controller into the view where it rightfully belongs.
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/controllers/merge.py | diffblobblamehistory | |
| cola/views/__init__.py | diffblobblamehistory |