Jesse Duffield 7995d56a85 allow editing or opening a file while resolving merge conflicts

2019-11-14 22:22:47 +11:00

..

app

472 - Don't panic if not in a repository

2019-07-14 14:24:18 +10:00

commands

show upstream branch for branch

2019-11-13 22:25:42 +11:00

config

add some shameless self promotion

2019-11-10 22:32:13 +11:00

gui

allow editing or opening a file while resolving merge conflicts

2019-11-14 22:22:47 +11:00

i18n

allow editing or opening a file while resolving merge conflicts

2019-11-14 22:22:47 +11:00

test

fix up tests

2019-03-02 13:39:09 +11:00

theme

support split view in staging panel and staging ranges

2019-11-05 19:22:01 +11:00

updates

remove go-getter

2019-11-12 22:58:01 +11:00

utils

Support building and moving patches

2019-11-05 19:22:01 +11:00