Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lazygit/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ git:
# Auto-fetch every 60 seconds
autoFetch: true
autoRefresh: true
# Use delta for diffs (matching your git config)
paging:
colorArg: always
pager: delta --paging=never
# Use delta for diffs with correct panel width for side-by-side
pagers:
- pager: delta --paging=never --width={{columnWidth}}
# Better merge behavior
merging:
args: "--no-ff"
Expand Down
Binary file added lazygit/lazygit-delta-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions offlineimap/offlineimap.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ def get_keychain_pass(account):
process = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
process.wait()
if process.returncode != 0:
raise RuntimeError(
"Error running command: {}".format(process.stderr.read().decode())
)
raise RuntimeError("Error running command: {}".format(process.stderr.read().decode()))

password_block = process.stdout.read().decode().strip()
if password_block:
Expand Down
Loading