Giorgio Previtera 212327d746 #477 Discard changes when there are merge conflicts ...

If there are merge conflicts, reset the file and discard all changes

2019-07-27 11:05:23 +10:00

..

app

472 - Don't panic if not in a repository

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

commands

#477 Discard changes when there are merge conflicts

2019-07-27 11:05:23 +10:00

config

fix typo

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

git

err was assigned but never checked

2019-07-27 10:55:01 +10:00

gui

Simplified code a bit

2019-07-27 10:52:06 +10:00

i18n

472 - Update error message

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

test

fix up tests

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

updates

use go-errors package to display stacktrace of errors that cause panics

2019-02-11 22:39:17 +11:00

utils

Removed unnecessary string conversion

2019-07-27 10:51:17 +10:00