| commit | 5d2035424de2d957c844c888c1af8e7fafb1f476 | |
| author | David Aguilar <davvid@gmail.com> | |
| Tue, 7 Mar 2023 09:06:45 +0000 (7 01:06 -0800) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Tue, 7 Mar 2023 09:07:33 +0000 (7 01:07 -0800) | ||
| tree | 5a6ad0a33e65a40c0949257bc54e74049487bf23 | treesnapshot (tar.gz zip) |
| parent | c0d10df586683a06c5b32c2b9b3038f346fbec60 | commitdiff |
status: add support for "git checkout --theirs/--ours" on unmerge files
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/cmds.py | diffblobblamehistory | |
| cola/widgets/status.py | diffblobblamehistory |