diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-11 19:28:32 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-11 19:28:32 +1000 |
commit | 8f6329c402eb7368c63453e8f2593074394bf223 (patch) | |
tree | 9b5e1d48e60cf273b1476a38b21b85e4d71f4557 /test/merge_conflict.sh | |
parent | 471a7de4181a01eb53161bdcf1219b73f4250b8f (diff) |
if you are using gpgsign, must use git editor to commit
Diffstat (limited to 'test/merge_conflict.sh')
0 files changed, 0 insertions, 0 deletions