diff --git a/lazygit/config.yml b/lazygit/config.yml index 838dd48..8e9d2dc 100644 --- a/lazygit/config.yml +++ b/lazygit/config.yml @@ -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" diff --git a/lazygit/lazygit-delta-screenshot.png b/lazygit/lazygit-delta-screenshot.png new file mode 100644 index 0000000..609df2a Binary files /dev/null and b/lazygit/lazygit-delta-screenshot.png differ diff --git a/offlineimap/offlineimap.py b/offlineimap/offlineimap.py index 4e8b420..d46fd1c 100644 --- a/offlineimap/offlineimap.py +++ b/offlineimap/offlineimap.py @@ -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: