| commit | 17c1bd1885c825be38063f57ea76d7076732ba98 | |
| author | David Aguilar <davvid@gmail.com> | |
| Mon, 8 Jul 2013 21:18:11 +0000 (8 14:18 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Mon, 8 Jul 2013 21:18:11 +0000 (8 14:18 -0700) | ||
| tree | e93a7e93aa774687ecb702ec0d38c593b75f1364 | treesnapshot (tar.gz zip) |
| parent | 619fcba90ecfac0b02797485b28bc24e3305bbb3 | commitdiff |
status: launch "mergetool" on unmerged paths for Ctrl+D
Teach the Ctrl+D shortcut to launch "mergetool" when a path is unmerged.
Previously, we would blindly launch "difftool", which silently fails.
Make the user experience seemless by adding automatically invoking
"mergetool" when "difftool" is requested on an unmerged path.
Signed-off-by: David Aguilar <davvid@gmail.com>
Teach the Ctrl+D shortcut to launch "mergetool" when a path is unmerged.
Previously, we would blindly launch "difftool", which silently fails.
Make the user experience seemless by adding automatically invoking
"mergetool" when "difftool" is requested on an unmerged path.
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/cmds.py | diffblobblamehistory | |
| cola/widgets/status.py | diffblobblamehistory |