merge: add a commit checkbox to allow merging w/out commit
commitd16c8781e9c3bc3a0c98eaf27fc6e35d71104fe4
authorDavid Aguilar <davvid@gmail.com>
Tue, 15 Apr 2008 09:37:47 +0000 (15 02:37 -0700)
committerDavid Aguilar <davvid@gmail.com>
Tue, 15 Apr 2008 09:37:47 +0000 (15 02:37 -0700)
tree098f70a9e59ecc56ae63ce706322b1a6aa8a223b
parent049bb53ab1d35d7205581c0bec81b807d9ae504e
merge: add a commit checkbox to allow merging w/out commit

Signed-off-by: David Aguilar <davvid@gmail.com>
ugit/controllers/merge.py
ui/merge.ui