dsh-ide-git 0.22.0 → 0.24.0

package/src/client.js

@@ -315,6 +315,8 @@ window.__ModuleLoader__.load({
       'settings.placement.tabHint': '关闭后仍可从右侧栏或底部面板打开。',
       'settings.placement.immersive': '沉浸模式(占满全高,隐藏输入框)',
       'settings.placement.immersiveHint': '开启后 Git 标签页占满整个会话区高度,输入框自动收起;审批与提问仍会正常显示。',
+      'settings.diff.inline': '在面板内预览差异',
+      'settings.diff.inlineHint': '开启后差异在 Git 面板内打开，可使用左右分栏与自动换行；关闭后交给侧边栏的 diff 预览。',
       'preview.openFile': '打开文件预览',
       'lf.added': '+{count}',
       'lf.deleted': '-{count}',
@@ -432,6 +434,10 @@ window.__ModuleLoader__.load({
       'prompt.newTag': '新标签名',
       'prompt.fromHead': '当前 HEAD',
       'error.dismiss': '关闭',
+      'error.pushRejected': '推送被拒绝：远程分支上有你本地没有的提交。请先「同步」（拉取并推送），或拉取合并后再推送。',
+      'error.pullDiverged': '本地和远程各有新提交，无法快进。请用「拉取」合并，或改用「拉取(变基)」。',
+      'error.pullConflict': '拉取时发生冲突：请在「变更」里解决冲突文件并提交，然后继续。',
+      'error.pullDirty': '拉取会覆盖本地未提交的更改：请先提交或贮藏这些更改。',
       'status.loading': '正在读取...',
       'status.busy': '处理中...',
       'counts.staged': '已暂存 {n}',
@@ -681,6 +687,8 @@ window.__ModuleLoader__.load({
       'settings.placement.tabHint': 'Off, the panel stays reachable from the right sidebar and the bottom panel.',
       'settings.placement.immersive': 'Immersive mode (full height, hidden composer)',
       'settings.placement.immersiveHint': 'On, the Git tab fills the whole conversation area and the composer steps aside; approvals and questions still show.',
+      'settings.diff.inline': 'Preview diffs in the panel',
+      'settings.diff.inlineHint': 'On, diffs open inside the Git panel with split view and line wrap. Off, the sidebar\'s diff preview takes over.',
       'preview.openFile': 'Open in the file preview',
       'lf.added': '+{count}',
       'lf.deleted': '-{count}',
@@ -798,6 +806,10 @@ window.__ModuleLoader__.load({
       'prompt.newTag': 'New tag name',
       'prompt.fromHead': 'current HEAD',
       'error.dismiss': 'Dismiss',
+      'error.pushRejected': 'Push rejected: the remote branch has commits you do not have. Sync (pull and push), or pull (merge) and push again.',
+      'error.pullDiverged': 'Local and remote have both moved, so a fast-forward is impossible. Pull with merge, or use Pull (Rebase).',
+      'error.pullConflict': 'Pull stopped on conflicts: resolve the conflicted files under Changes, then commit.',
+      'error.pullDirty': 'Pull would overwrite uncommitted local changes. Commit or stash them first.',
       'status.loading': 'Reading...',
       'status.busy': 'Working...',
       'counts.staged': 'Staged {n}',
@@ -1055,6 +1067,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': '關閉之後仍可從右側欄或底部面板開啟。',
         'settings.placement.immersive': '沉浸模式(佔滿全高,隱藏輸入框)',
         'settings.placement.immersiveHint': '開啟之後 Git 分頁會佔滿整個會話區高度,輸入框自動收起;審批與提問仍會正常顯示。',
+        'settings.diff.inline': '喺面板內預覽差異',
+        'settings.diff.inlineHint': '開啟之後差異喺 Git 面板內開啟，可以用左右分欄同自動換行；關閉之後交畀側邊欄嘅 diff 預覽。',
         'preview.openFile': '開啟檔案預覽',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -1172,6 +1186,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': '新標籤名',
         'prompt.fromHead': '當前 HEAD',
         'error.dismiss': '關閉',
+        'error.pushRejected': '推送被拒絕:遠端分支有啲你本地冇嘅提交。請先同步(拉取並推送),或者拉取合併之後再推送。',
+        'error.pullDiverged': '本地同遠端各有新提交,唔可以快進。請用「拉取」合併,或者改用「拉取(變基)」。',
+        'error.pullConflict': '拉取時有衝突:喺「變更」入面解決衝突檔案並提交,然後繼續。',
+        'error.pullDirty': '拉取會覆蓋本地未提交嘅改動:請先提交或者貯藏呢啲改動。',
         'status.loading': '讀取中...',
         'status.busy': '處理中...',
         'counts.staged': '已暫存 {n}',
@@ -1421,6 +1439,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': '關閉之後仍可從右側欄或底部面板開啟。',
         'settings.placement.immersive': '沉浸模式(佔滿全高,隱藏輸入框)',
         'settings.placement.immersiveHint': '開啟之後 Git 分頁會佔滿整個對話區高度,輸入框自動收起;審核與提問仍會正常顯示。',
+        'settings.diff.inline': '在面板內預覽差異',
+        'settings.diff.inlineHint': '開啟後差異在 Git 面板內開啟，可使用左右分欄與自動換行；關閉後交給側邊欄的 diff 預覽。',
         'preview.openFile': '開啟檔案預覽',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -1538,6 +1558,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': '新標籤名稱',
         'prompt.fromHead': '目前 HEAD',
         'error.dismiss': '關閉',
+        'error.pushRejected': '推送被拒絕：遠端分支上有你本機沒有的提交。請先同步（拉取並推送），或拉取合併後再推送。',
+        'error.pullDiverged': '本機與遠端各有新提交，無法快進。請用「拉取」合併，或改用「拉取（變基）」。',
+        'error.pullConflict': '拉取時發生衝突：請在「變更」中解決衝突檔案並提交，然後繼續。',
+        'error.pullDirty': '拉取會覆蓋本機未提交的變更：請先提交或貯藏這些變更。',
         'status.loading': '讀取中...',
         'status.busy': '處理中...',
         'counts.staged': '已暫存 {n}',
@@ -1787,6 +1811,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': '關閉之後仍可從右側欄或底部面板開啟。',
         'settings.placement.immersive': '沉浸模式(佔滿全高,隱藏輸入框)',
         'settings.placement.immersiveHint': '開啟之後 Git 分頁會佔滿整個會話區高度,輸入框自動收起;審批與提問仍會正常顯示。',
+        'settings.diff.inline': '在面板內預覽差異',
+        'settings.diff.inlineHint': '開啟後差異在 Git 面板內開啟，可使用左右分欄與自動換行；關閉後交給側邊欄的 diff 預覽。',
         'preview.openFile': '開啟檔案預覽',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -1904,6 +1930,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': '新標籤名',
         'prompt.fromHead': '當前 HEAD',
         'error.dismiss': '關閉',
+        'error.pushRejected': '推送被拒絕:遠端分支有啲你本地冇嘅提交。請先同步(拉取並推送),或者拉取合併之後再推送。',
+        'error.pullDiverged': '本地同遠端各有新提交,唔可以快進。請用「拉取」合併,或者改用「拉取(變基)」。',
+        'error.pullConflict': '拉取時有衝突:喺「變更」入面解決衝突檔案並提交,然後繼續。',
+        'error.pullDirty': '拉取會覆蓋本地未提交嘅改動:請先提交或者貯藏呢啲改動。',
         'status.loading': '讀取中...',
         'status.busy': '處理中...',
         'counts.staged': '已暫存 {n}',
@@ -2153,6 +2183,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'オフにしても右サイドバーと下部パネルから開けます。',
         'settings.placement.immersive': '没入モード(全高表示・入力欄を非表示)',
         'settings.placement.immersiveHint': 'オンにすると Git タブが会話エリアの高さいっぱいに広がり、入力欄は引っ込みます。承認や質問は通常どおり表示されます。',
+        'settings.diff.inline': 'パネル内で差分をプレビュー',
+        'settings.diff.inlineHint': 'オンの場合、差分は Git パネル内で開き、左右分割と折り返しを使用できます。オフの場合はサイドバーの差分プレビューに任せます。',
         'preview.openFile': 'ファイルプレビューを開く',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -2270,6 +2302,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': '新しいタグ名',
         'prompt.fromHead': '現在の HEAD',
         'error.dismiss': '閉じる',
+        'error.pushRejected': 'プッシュが拒否されました：リモートブランチにローカルにないコミットがあります。先に同期（プルしてプッシュ）するか、プル（マージ）してから再プッシュしてください。',
+        'error.pullDiverged': 'ローカルとリモートの両方に新しいコミットがあり、fast-forward できません。「プル」（マージ）または「プル（リベース）」を使ってください。',
+        'error.pullConflict': 'プルで競合が発生しました。「変更」で競合ファイルを解決してコミットしてから続行してください。',
+        'error.pullDirty': 'プルするとローカルの未コミット変更が上書きされます。先にコミットするかスタッシュしてください。',
         'status.loading': '読み込み中...',
         'status.busy': '処理中...',
         'counts.staged': 'ステージ済み {n}',
@@ -2519,6 +2555,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': '꺼도 오른쪽 사이드바와 하단 패널에서 열 수 있습니다.',
         'settings.placement.immersive': '몰입 모드(전체 높이, 입력창 숨김)',
         'settings.placement.immersiveHint': '켜면 Git 탭이 대화 영역 전체 높이를 차지하고 입력창은 숨겨집니다. 승인과 질문은 정상적으로 표시됩니다.',
+        'settings.diff.inline': '패널에서 차이 미리보기',
+        'settings.diff.inlineHint': '켜면 차이가 Git 패널 안에서 열리고 좌우 분할과 자동 줄바꿈을 사용할 수 있습니다. 끄면 사이드바의 차이 미리보기로 넘깁니다.',
         'preview.openFile': '파일 미리보기로 열기',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -2636,6 +2674,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': '새 태그 이름',
         'prompt.fromHead': '현재 HEAD',
         'error.dismiss': '닫기',
+        'error.pushRejected': '푸시가 거부되었습니다: 원격 브랜치에 로컬에 없는 커밋이 있습니다. 먼저 동기화(풀 후 푸시)하거나 풀(병합)한 뒤 다시 푸시하세요.',
+        'error.pullDiverged': '로컬과 원격에 각각 새 커밋이 있어 fast-forward할 수 없습니다. 풀(병합) 또는 풀(리베이스)을 사용하세요.',
+        'error.pullConflict': '풀 중 충돌이 발생했습니다. "변경"에서 충돌 파일을 해결하고 커밋한 뒤 계속하세요.',
+        'error.pullDirty': '풀을 하면 로컬의 커밋되지 않은 변경이 덮어써집니다. 먼저 커밋하거나 스태시하세요.',
         'status.loading': '읽는 중...',
         'status.busy': '처리 중...',
         'counts.staged': '스테이지됨 {n}',
@@ -2885,6 +2927,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Ausgeschaltet bleibt das Panel über rechte Seitenleiste und unteres Panel erreichbar.',
         'settings.placement.immersive': 'Immersiver Modus (volle Höhe, ausgeblendetes Eingabefeld)',
         'settings.placement.immersiveHint': 'Eingeschaltet füllt der Git-Tab die gesamte Gesprächshöhe und das Eingabefeld weicht zurück; Freigaben und Rückfragen bleiben sichtbar.',
+        'settings.diff.inline': 'Diffs im Panel anzeigen',
+        'settings.diff.inlineHint': 'Ein: Diffs öffnen im Git-Panel, mit geteilter Ansicht und Zeilenumbruch. Aus: Die Diff-Vorschau der Seitenleiste übernimmt.',
         'preview.openFile': 'In der Dateivorschau öffnen',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -3002,6 +3046,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Name des neuen Tags',
         'prompt.fromHead': 'aktuelles HEAD',
         'error.dismiss': 'Schließen',
+        'error.pushRejected': 'Push abgelehnt: Der Remote-Branch enthält Commits, die lokal fehlen. Zuerst synchronisieren (Pull und Push) oder pullen (Merge) und dann erneut pushen.',
+        'error.pullDiverged': 'Lokal und remote sind beide weitergezogen; ein Fast-Forward ist unmöglich. Mit Merge pullen oder Pull (Rebase) verwenden.',
+        'error.pullConflict': 'Pull wurde wegen Konflikten gestoppt: Konfliktdateien unter „Änderungen“ auflösen, committen und dann fortfahren.',
+        'error.pullDirty': 'Pull würde lokale, nicht committete Änderungen überschreiben. Zuerst committen oder stashen.',
         'status.loading': 'Wird gelesen...',
         'status.busy': 'Arbeitet...',
         'counts.staged': 'Vorgemerkt {n}',
@@ -3251,6 +3299,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Désactivé, le panneau reste accessible depuis la barre latérale droite et le panneau inférieur.',
         'settings.placement.immersive': 'Mode immersif (pleine hauteur, zone de saisie masquée)',
         'settings.placement.immersiveHint': 'Activé, l’onglet Git occupe toute la hauteur de la conversation et la zone de saisie s’efface ; approbations et questions restent visibles.',
+        'settings.diff.inline': 'Aperçu des diffs dans le panneau',
+        'settings.diff.inlineHint': 'Activé, les diffs s’ouvrent dans le panneau Git, avec vue scindée et retour à la ligne. Désactivé, l’aperçu diff de la barre latérale prend le relais.',
         'preview.openFile': 'Ouvrir dans l’aperçu du fichier',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -3368,6 +3418,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Nom de la nouvelle étiquette',
         'prompt.fromHead': 'HEAD courant',
         'error.dismiss': 'Fermer',
+        'error.pushRejected': 'Push refusé : la branche distante contient des commits absents en local. Synchronisez (pull puis push) ou faites un pull (merge), puis poussez à nouveau.',
+        'error.pullDiverged': 'Local et distant ont tous deux avancé ; le fast-forward est impossible. Faites un pull (merge) ou un pull (rebase).',
+        'error.pullConflict': 'Le pull s\'est arrêté sur des conflits : résolvez les fichiers en conflit dans « Modifications », puis validez.',
+        'error.pullDirty': 'Le pull écraserait des modifications locales non validées. Validez-les ou remisez-les d\'abord.',
         'status.loading': 'Lecture...',
         'status.busy': 'En cours...',
         'counts.staged': 'Indexé {n}',
@@ -3617,6 +3671,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'В выключенном виде панель доступна из правой боковой панели и нижней панели.',
         'settings.placement.immersive': 'Полноэкранный режим (во всю высоту, без поля ввода)',
         'settings.placement.immersiveHint': 'Во включённом виде вкладка Git занимает всю высоту области диалога, поле ввода скрывается; подтверждения и вопросы остаются на виду.',
+        'settings.diff.inline': 'Просмотр различий в панели',
+        'settings.diff.inlineHint': 'Включено: различия открываются в панели Git с разделённым видом и переносом строк. Выключено: показ переходит к боковой панели.',
         'preview.openFile': 'Открыть в предпросмотре файла',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -3734,6 +3790,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Имя нового тега',
         'prompt.fromHead': 'текущий HEAD',
         'error.dismiss': 'Закрыть',
+        'error.pushRejected': 'Push отклонён: в удалённой ветке есть коммиты, которых нет локально. Сначала синхронизируйтесь (pull и push) или выполните pull (merge), затем повторите push.',
+        'error.pullDiverged': 'Локальная и удалённая ветки разошлись; fast-forward невозможен. Используйте pull (merge) или pull (rebase).',
+        'error.pullConflict': 'Pull остановился из-за конфликтов: разрешите конфликтные файлы в «Изменениях» и закоммитьте их.',
+        'error.pullDirty': 'Pull перезапишет незакоммиченные локальные изменения. Сначала закоммитьте или спрячьте их.',
         'status.loading': 'Чтение...',
         'status.busy': 'Работа...',
         'counts.staged': 'В индексе {n}',
@@ -3983,6 +4043,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Desligado, o painel continua disponível na barra lateral direita e no painel inferior.',
         'settings.placement.immersive': 'Modo imersivo (altura total, campo de entrada oculto)',
         'settings.placement.immersiveHint': 'Ativado, a aba Git ocupa toda a altura da conversa e o campo de entrada fica de lado; aprovações e perguntas continuam visíveis.',
+        'settings.diff.inline': 'Pré-visualizar diferenças no painel',
+        'settings.diff.inlineHint': 'Ligado, as diferenças abrem no painel Git, com vista dividida e quebra de linha. Desligado, a pré-visualização da barra lateral assume.',
         'preview.openFile': 'Abrir na pré-visualização do arquivo',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -4100,6 +4162,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Nome da nova tag',
         'prompt.fromHead': 'HEAD atual',
         'error.dismiss': 'Fechar',
+        'error.pushRejected': 'Push rejeitado: o branch remoto tem commits que não existem localmente. Sincronize (pull e push) ou faça pull (merge) e envie novamente.',
+        'error.pullDiverged': 'Local e remoto avançaram; o fast-forward é impossível. Use pull (merge) ou pull (rebase).',
+        'error.pullConflict': 'O pull parou em conflitos: resolva os arquivos em conflito em "Alterações" e faça o commit.',
+        'error.pullDirty': 'O pull sobrescreveria alterações locais não commitadas. Faça commit ou stash primeiro.',
         'status.loading': 'Lendo...',
         'status.busy': 'Trabalhando...',
         'counts.staged': 'Preparado {n}',
@@ -4349,6 +4415,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Da spento, il pannello resta raggiungibile dalla barra laterale destra e dal pannello inferiore.',
         'settings.placement.immersive': 'Modalità immersiva (altezza piena, input nascosto)',
         'settings.placement.immersiveHint': 'Attiva, la scheda Git occupa tutta l’altezza della conversazione e la barra di input resta nascosta; approvazioni e domande restano visibili.',
+        'settings.diff.inline': 'Anteprima delle differenze nel pannello',
+        'settings.diff.inlineHint': 'Attivo: le differenze si aprono nel pannello Git, con vista affiancata e ritorno a capo. Disattivo: subentra l’anteprima della barra laterale.',
         'preview.openFile': 'Apri nell’anteprima del file',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -4466,6 +4534,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Nome del nuovo tag',
         'prompt.fromHead': 'HEAD corrente',
         'error.dismiss': 'Chiudi',
+        'error.pushRejected': 'Push rifiutato: il branch remoto contiene commit assenti in locale. Sincronizza (pull e push) oppure esegui pull (merge) e riprova.',
+        'error.pullDiverged': 'Locale e remoto sono avanzati entrambi; il fast-forward è impossibile. Usa pull (merge) o pull (rebase).',
+        'error.pullConflict': 'Il pull si è fermato per conflitti: risolvi i file in conflitto in "Modifiche", poi esegui il commit.',
+        'error.pullDirty': 'Il pull sovrascriverebbe modifiche locali non committate. Esegui prima commit o stash.',
         'status.loading': 'Lettura...',
         'status.busy': 'In corso...',
         'counts.staged': 'In stage {n}',
@@ -4715,6 +4787,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Uitgeschakeld blijft het paneel bereikbaar via de rechterzijbalk en het onderpaneel.',
         'settings.placement.immersive': 'Meeslepende modus (volledige hoogte, verborgen invoerveld)',
         'settings.placement.immersiveHint': 'Aan: het Git-tabblad vult de hele gespreksruimte en het invoerveld wijkt; goedkeuringen en vragen blijven zichtbaar.',
+        'settings.diff.inline': 'Diffs in het paneel bekijken',
+        'settings.diff.inlineHint': 'Aan: diffs openen in het Git-paneel, met gesplitste weergave en regelterugloop. Uit: de diff-voorvertoning in de zijbalk neemt het over.',
         'preview.openFile': 'Openen in de bestandsvoorbeeld',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -4832,6 +4906,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Naam van de nieuwe tag',
         'prompt.fromHead': 'huidige HEAD',
         'error.dismiss': 'Sluiten',
+        'error.pushRejected': 'Push geweigerd: de remote branch heeft commits die lokaal ontbreken. Synchroniseer (pull en push) of pull (merge) en push daarna opnieuw.',
+        'error.pullDiverged': 'Lokaal en remote zijn beide verdergegaan; fast-forward is onmogelijk. Gebruik pull (merge) of pull (rebase).',
+        'error.pullConflict': 'Pull stopte door conflicten: los de conflictbestanden op onder "Wijzigingen" en commit daarna.',
+        'error.pullDirty': 'Pull zou niet-gecommitte lokale wijzigingen overschrijven. Commit of stash ze eerst.',
         'status.loading': 'Lezen...',
         'status.busy': 'Bezig...',
         'counts.staged': 'Gestaged {n}',
@@ -5081,6 +5159,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Po wyłączeniu panel pozostaje dostępny z prawego paska bocznego i dolnego panelu.',
         'settings.placement.immersive': 'Tryb immersyjny (pełna wysokość, ukryte pole wpisywania)',
         'settings.placement.immersiveHint': 'Po włączeniu karta Git wypełnia całą wysokość rozmowy, a pole wpisywania się chowa; zatwierdzenia i pytania pozostają widoczne.',
+        'settings.diff.inline': 'Podgląd różnic w panelu',
+        'settings.diff.inlineHint': 'Włączone: różnice otwierają się w panelu Git, z widokiem dzielonym i zawijaniem wierszy. Wyłączone: podgląd różnic w pasku bocznym przejmuje.',
         'preview.openFile': 'Otwórz w podglądzie pliku',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -5198,6 +5278,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Nazwa nowego tagu',
         'prompt.fromHead': 'bieżący HEAD',
         'error.dismiss': 'Zamknij',
+        'error.pushRejected': 'Push odrzucony: zdalna gałąź ma commity, których nie ma lokalnie. Najpierw zsynchronizuj (pull i push) albo wykonaj pull (merge) i ponów push.',
+        'error.pullDiverged': 'Lokalna i zdalna gałąź rozeszły się; fast-forward jest niemożliwy. Użyj pull (merge) lub pull (rebase).',
+        'error.pullConflict': 'Pull zatrzymał się na konfliktach: rozwiąż pliki konfliktów w „Zmianach” i zatwierdź zmiany.',
+        'error.pullDirty': 'Pull nadpisałby niezatwierdzone zmiany lokalne. Najpierw je zatwierdź lub schowaj.',
         'status.loading': 'Wczytywanie...',
         'status.busy': 'Praca...',
         'counts.staged': 'W indeksie {n}',
@@ -5447,6 +5531,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Avstängd finns panelen kvar via höger sidopanel och nedre panelen.',
         'settings.placement.immersive': 'Uppslukande läge (full höjd, dolt inmatningsfält)',
         'settings.placement.immersiveHint': 'På: Git-fliken fyller hela konversationsytan och inmatningsfältet träder åt sidan; godkännanden och frågor visas fortfarande.',
+        'settings.diff.inline': 'Förhandsgranska diffar i panelen',
+        'settings.diff.inlineHint': 'På: diffar öppnas i Git-panelen med delad vy och radbrytning. Av: sidopanelens diff-förhandsgranskning tar över.',
         'preview.openFile': 'Öppna i filförhandsvisningen',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -5564,6 +5650,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Namn på ny tagg',
         'prompt.fromHead': 'aktuell HEAD',
         'error.dismiss': 'Stäng',
+        'error.pushRejected': 'Push avvisades: fjärrgrenen har commits som saknas lokalt. Synkronisera (pull och push) eller gör pull (merge) och pusha igen.',
+        'error.pullDiverged': 'Lokalt och fjärr har båda flyttats; fast-forward är omöjligt. Använd pull (merge) eller pull (rebase).',
+        'error.pullConflict': 'Pull stoppade på konflikter: lös konfliktfilerna under "Ändringar" och commit:a.',
+        'error.pullDirty': 'Pull skulle skriva över lokala ej commit:ade ändringar. Commit:a eller stash:a dem först.',
         'status.loading': 'Läser...',
         'status.busy': 'Arbetar...',
         'counts.staged': 'Klädda {n}',
@@ -5813,6 +5903,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Kapatıldığında panel sağ kenar çubuğundan ve alt panelden açılabilir.',
         'settings.placement.immersive': 'Odaklanma modu (tam yükseklik, gizli giriş alanı)',
         'settings.placement.immersiveHint': 'Açıkken Git sekmesi tüm konuşma alanını kaplar ve giriş alanı gizlenir; onaylar ve sorular yine de görünür.',
+        'settings.diff.inline': 'Farkları panelde önizle',
+        'settings.diff.inlineHint': 'Açık: farklar Git panelinde açılır; bölünmüş görünüm ve satır kaydırma kullanılabilir. Kapalı: kenar çubuğundaki fark önizlemesi devralır.',
         'preview.openFile': 'Dosya önizlemesinde aç',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -5930,6 +6022,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Yeni etiket adı',
         'prompt.fromHead': 'geçerli HEAD',
         'error.dismiss': 'Kapat',
+        'error.pushRejected': 'Push reddedildi: uzak dalda yerelde olmayan commit\'ler var. Önce senkronize edin (pull ve push) veya pull (merge) yapıp yeniden push\'layın.',
+        'error.pullDiverged': 'Yerel ve uzak dal ikisi de ilerledi; fast-forward mümkün değil. Pull (merge) veya pull (rebase) kullanın.',
+        'error.pullConflict': 'Pull çakışmalarda durdu: "Değişiklikler" altında çakışan dosyaları çözüp commit\'leyin.',
+        'error.pullDirty': 'Pull, commit\'lenmemiş yerel değişikliklerin üzerine yazar. Önce commit\'leyin veya stash\'leyin.',
         'status.loading': 'Okunuyor...',
         'status.busy': 'Çalışıyor...',
         'counts.staged': 'Hazırlanan {n}',
@@ -6179,6 +6275,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Dimatikan, panel tetap bisa dibuka dari bilah sisi kanan dan panel bawah.',
         'settings.placement.immersive': 'Mode imersif (tinggi penuh, kolom masukan tersembunyi)',
         'settings.placement.immersiveHint': 'Aktif: tab Git memenuhi seluruh tinggi area percakapan dan kolom masukan mengalah; persetujuan dan pertanyaan tetap tampil.',
+        'settings.diff.inline': 'Pratinjau diff di panel',
+        'settings.diff.inlineHint': 'Aktif: diff terbuka di panel Git, dengan tampilan terbagi dan pelipatan baris. Nonaktif: pratinjau diff bilah sisi mengambil alih.',
         'preview.openFile': 'Buka di pratinjau berkas',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -6296,6 +6394,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Nama tag baru',
         'prompt.fromHead': 'HEAD saat ini',
         'error.dismiss': 'Tutup',
+        'error.pushRejected': 'Push ditolak: branch remote memiliki commit yang tidak ada di lokal. Sinkronkan (pull lalu push) atau pull (merge) lalu push lagi.',
+        'error.pullDiverged': 'Lokal dan remote sama-sama maju; fast-forward tidak mungkin. Gunakan pull (merge) atau pull (rebase).',
+        'error.pullConflict': 'Pull berhenti karena konflik: selesaikan file konflik di "Perubahan", lalu commit.',
+        'error.pullDirty': 'Pull akan menimpa perubahan lokal yang belum di-commit. Commit atau stash dulu.',
         'status.loading': 'Membaca...',
         'status.busy': 'Bekerja...',
         'counts.staged': 'Ter-stage {n}',
@@ -6545,6 +6647,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'Tắt rồi, bảng vẫn mở được từ thanh bên phải và bảng dưới.',
         'settings.placement.immersive': 'Chế độ đắm chìm (chiều cao đầy đủ, ẩn ô nhập)',
         'settings.placement.immersiveHint': 'Bật: thẻ Git chiếm toàn bộ chiều cao vùng hội thoại và ô nhập thu vào; phê duyệt và câu hỏi vẫn hiển thị bình thường.',
+        'settings.diff.inline': 'Xem trước khác biệt trong bảng',
+        'settings.diff.inlineHint': 'Bật: khác biệt mở trong bảng Git, có chế độ chia đôi và tự động xuống dòng. Tắt: phần xem trước ở thanh bên đảm nhận.',
         'preview.openFile': 'Mở trong xem trước tệp',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -6662,6 +6766,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'Tên thẻ mới',
         'prompt.fromHead': 'HEAD hiện tại',
         'error.dismiss': 'Đóng',
+        'error.pushRejected': 'Push bị từ chối: nhánh remote có commit mà local chưa có. Hãy đồng bộ (pull rồi push) hoặc pull (merge) rồi push lại.',
+        'error.pullDiverged': 'Local và remote đều đã tiến lên; không thể fast-forward. Dùng pull (merge) hoặc pull (rebase).',
+        'error.pullConflict': 'Pull dừng do xung đột: giải quyết các tệp xung đột trong "Thay đổi" rồi commit.',
+        'error.pullDirty': 'Pull sẽ ghi đè thay đổi local chưa commit. Hãy commit hoặc stash trước.',
         'status.loading': 'Đang đọc...',
         'status.busy': 'Đang xử lý...',
         'counts.staged': 'Đã stage {n}',
@@ -6911,6 +7019,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'عند الإيقاف تبقى اللوحة متاحة من الشريط الجانبي الأيمن واللوحة السفلية.',
         'settings.placement.immersive': 'الوضع الغامر (ارتفاع كامل، إخفاء صندوق الكتابة)',
         'settings.placement.immersiveHint': 'عند التشغيل يملأ تبويب Git منطقة المحادثة بكامل ارتفاعها ويتراجع صندوق الكتابة؛ تظل الموافقات والأسئلة ظاهرة كالمعتاد.',
+        'settings.diff.inline': 'معاينة الفروق داخل اللوحة',
+        'settings.diff.inlineHint': 'عند التشغيل تفتح الفروق داخل لوحة Git مع العرض المنقسم والتفاف الأسطر. عند الإيقاف تتولاها معاينة الفروق في الشريط الجانبي.',
         'preview.openFile': 'افتح في معاينة الملف',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -7028,6 +7138,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'اسم الوسم الجديد',
         'prompt.fromHead': 'HEAD الحالي',
         'error.dismiss': 'إغلاق',
+        'error.pushRejected': 'تم رفض الدفع: الفرع البعيد يحتوي على commits غير موجودة محليًا. زامن أولًا (pull ثم push) أو اسحب (merge) ثم أعد الدفع.',
+        'error.pullDiverged': 'تقدّم الفرعان المحلي والبعيد؛ لا يمكن fast-forward. استخدم pull (merge) أو pull (rebase).',
+        'error.pullConflict': 'توقف pull بسبب تعارضات: حلّ ملفات التعارض في "التغييرات" ثم commit.',
+        'error.pullDirty': 'سيؤدي pull إلى الكتابة فوق تغييرات محلية غير مثبتة. ثبّتها أو خزّنها أولًا.',
         'status.loading': 'جارٍ القراءة...',
         'status.busy': 'جارٍ العمل...',
         'counts.staged': 'مُجهَّز {n}',
@@ -7277,6 +7391,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'बंद करने पर भी पैनल दाएँ साइडबार और निचले पैनल से खुलता है।',
         'settings.placement.immersive': 'इमर्सिव मोड (पूरी ऊँचाई, छिपा इनपुट बॉक्स)',
         'settings.placement.immersiveHint': 'चालू होने पर Git टैब पूरे संवाद क्षेत्र की ऊँचाई घेर लेता है और इनपुट बॉक्स हट जाता है; अनुमोदन और प्रश्न फिर भी दिखते हैं।',
+        'settings.diff.inline': 'पैनल में अंतर देखें',
+        'settings.diff.inlineHint': 'चालू: अंतर Git पैनल में खुलते हैं, स्प्लिट व्यू और लाइन रैप के साथ। बंद: साइडबार का अंतर पूर्वावलोकन संभालता है।',
         'preview.openFile': 'फ़ाइल पूर्वावलोकन में खोलें',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -7394,6 +7510,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'नए टैग का नाम',
         'prompt.fromHead': 'वर्तमान HEAD',
         'error.dismiss': 'बंद करें',
+        'error.pushRejected': 'पुश अस्वीकृत: रिमोट ब्रांच में ऐसे commits हैं जो लोकल में नहीं हैं। पहले सिंक करें (pull फिर push) या pull (merge) करके फिर से push करें।',
+        'error.pullDiverged': 'लोकल और रिमोट दोनों आगे बढ़े हैं; fast-forward संभव नहीं। pull (merge) या pull (rebase) इस्तेमाल करें।',
+        'error.pullConflict': 'pull conflicts पर रुक गया: "परिवर्तन" में conflict फ़ाइलें हल करें, फिर commit करें।',
+        'error.pullDirty': 'pull लोकल की uncommitted changes को overwrite करेगा। पहले commit या stash करें।',
         'status.loading': 'पढ़ा जा रहा है...',
         'status.busy': 'कार्य जारी...',
         'counts.staged': 'स्टेज्ड {n}',
@@ -7643,6 +7763,8 @@ window.__ModuleLoader__.load({
         'settings.placement.tabHint': 'ปิดแล้วยังเปิดแผงจากแถบข้างขวาหรือแผงล่างได้',
         'settings.placement.immersive': 'โหมดดื่มด่ำ (เต็มความสูง, ซ่อนกล่องพิมพ์)',
         'settings.placement.immersiveHint': 'เมื่อเปิด แท็บ Git จะกินพื้นที่สูงทั้งหมดของบทสนทนาและกล่องพิมพ์จะถอยออก; การอนุมัติและคำถามยังแสดงตามปกติ',
+        'settings.diff.inline': 'ดูตัวอย่างความแตกต่างในแผง',
+        'settings.diff.inlineHint': 'เปิด: ความแตกต่างเปิดในแผง Git พร้อมมุมมองแยกและตัดบรรทัดอัตโนมัติ ปิด: ตัวอย่างความแตกต่างในแถบข้างจะรับหน้าที่',
         'preview.openFile': 'เปิดในตัวอย่างไฟล์',
         'lf.added': '+{count}',
         'lf.deleted': '-{count}',
@@ -7760,6 +7882,10 @@ window.__ModuleLoader__.load({
         'prompt.newTag': 'ชื่อแท็กใหม่',
         'prompt.fromHead': 'HEAD ปัจจุบัน',
         'error.dismiss': 'ปิด',
+        'error.pushRejected': 'Push ถูกปฏิเสธ: สาขา remote มี commit ที่ยังไม่มีในเครื่องนี้ ให้ sync (pull แล้ว push) หรือ pull (merge) แล้ว push อีกครั้ง',
+        'error.pullDiverged': 'ทั้ง local และ remote มี commit ใหม่; fast-forward ไม่ได้ ใช้ pull (merge) หรือ pull (rebase)',
+        'error.pullConflict': 'Pull หยุดเพราะมี conflict: แก้ไฟล์ที่ขัดแย้งใน "การเปลี่ยนแปลง" แล้ว commit',
+        'error.pullDirty': 'Pull จะเขียนทับการเปลี่ยนแปลง local ที่ยังไม่ commit: ให้ commit หรือ stash ก่อน',
         'status.loading': 'กำลังอ่าน...',
         'status.busy': 'กำลังทำงาน...',
         'counts.staged': 'สเตจแล้ว {n}',
@@ -9326,47 +9452,6 @@ window.__ModuleLoader__.load({
       return false
     }
 
-    /* One single-file unified diff (what the host `diff` method returns) → the
-       one DiffHunk DiffBlock renders, by replaying ` `/`-`/`+` lines back into
-       the two sides. No `@@` at all (binary patches, mode-only changes) or a
-       pathless header → null, and the caller keeps the hand-drawn rows. */
-    function patchToHunk(patch) {
-      const text = typeof patch === 'string' ? patch : ''
-      if (text === '' || text.indexOf('@@') < 0) return null
-      const lines = text.split('\n')
-      let path = null
-      const oldText = []
-      const newText = []
-      for (const line of lines) {
-        if (line.indexOf('+++ ') === 0) {
-          const name = line.slice(4).split('\t')[0]
-          if (name !== '/dev/null') path = name.replace(/^b\//, '')
-          continue
-        }
-        if (line.indexOf('--- ') === 0) {
-          if (path === null) {
-            const name = line.slice(4).split('\t')[0]
-            if (name !== '/dev/null') path = name.replace(/^a\//, '')
-          }
-          continue
-        }
-        if (line.indexOf('@@') === 0) continue
-        if (line.indexOf('+') === 0) { newText.push(line.slice(1)); continue }
-        if (line.indexOf('-') === 0) { oldText.push(line.slice(1)); continue }
-        if (line.indexOf('\\') === 0) continue
-        if (line.indexOf(' ') === 0) { oldText.push(line.slice(1)); newText.push(line.slice(1)); continue }
-        // diff --git / index / new file mode / rename from ...: metadata above
-        // the first hunk; anything else after it would be malformed.
-        continue
-      }
-      if (path === null || path === '') return null
-      // A patch without body lines (mode-only, bare metadata) replays into an
-      // empty hunk that DiffBlock draws as nothing at all — keep the hand-drawn
-      // rows for those, they at least show what happened.
-      if (oldText.length === 0 && newText.length === 0) return null
-      return { path: path, oldText: oldText.length === 0 ? null : oldText.join('\n'), newText: newText.join('\n') }
-    }
-
     /* ============================== diff ============================== */
 
     function diffLines(patch) {
@@ -9403,13 +9488,13 @@ window.__ModuleLoader__.load({
 
     /* ---- diff selection core
        Pure line-number plumbing for the diff-pane context menu (v0.13.5).
-       The host DiffBlock draws rows WITHOUT line-number attributes — a row is
-       `<div class={line + kindClass}>{row.text}</div>` (DiffBlock.tsx:204) and
-       the `+`/`-`/two-space prefixes live in CSS `::before` content — so the
-       menu reconstructs numbers by replaying the ROW KINDS in document order
-       from the patch's first hunk header. The hand-drawn rows already carry
-       parsed numbers (diffLines above). Kept DOM-free between the markers so
-       tests/smoke.mjs can slice the block and drive the real implementation. */
+       For a host DiffBlock body (kept as a forward-compat fallback) rows do
+       not expose numbers, so the menu replays ROW KINDS in document order from
+       the patch's first hunk header; hand-drawn rows carry parsed numbers
+       (diffLines above). The review renderer used today (#22) reads its own
+       printed numbers instead (reviewRowSpanOf, DOM side below). Kept DOM-free
+       between the markers so tests/smoke.mjs can slice the block and drive the
+       real implementation. */
 
     const DIFF_SNIPPET_MAX = 600
 
@@ -9555,13 +9640,13 @@ window.__ModuleLoader__.load({
 
     /* ---------- DOM side of the diff-pane context menu (browser only) ----------
        SSR never calls these: they run inside the pane's onContextMenu, after
-       the selection has been captured. The row element under a selection
-       endpoint is either a hand-drawn `.dig-diff-line`, or a DiffBlock row —
-       a div child of the body whose OWN parent carries the `data-diff`
-       marker. `data-diff` is a component attribute (DiffBlock.tsx:199), not a
-       hashed CSS-module class, so the lookup does not bet on build-time class
-       renaming; the row KIND comes from the `::before` content the kinds are
-       painted with, for the same reason. */
+       the selection has been captured. A row under a selection endpoint is
+       either a review row (data-diff-line on .dig-lf-line / .dig-lf-splitLine
+       / .dig-lf-sideLine), a hand-drawn `.dig-diff-line`, or a host DiffBlock
+       row (a div child of the body whose OWN parent carries `data-diff`). The
+       review path reads the printed .dig-lf-number cells; the host path gets
+       its KIND from the `::before` content the rows are painted with. Both
+       rely on component attributes, not hashed CSS-module classes. */
 
     function savedSelectionOf() {
       try {
@@ -9582,6 +9667,15 @@ window.__ModuleLoader__.load({
         if (element.classList !== undefined && element.classList.contains('dig-diff-line') === true) {
           return { kind: 'drawn', row: element, body: element.parentElement }
         }
+        /* The review renderer (LineDiff, used by BOTH the inline pane and the
+           native preview since #22) stamps every row with data-diff-line and
+           carries the real line numbers in .dig-lf-number cells. */
+        if (element.hasAttribute !== undefined && element.hasAttribute('data-diff-line') === true
+          && element.classList !== undefined
+          && (element.classList.contains('dig-lf-line') === true || element.classList.contains('dig-lf-splitLine') === true || element.classList.contains('dig-lf-sideLine') === true)) {
+          const body = element.closest === undefined ? null : element.closest('.dig-lf-body')
+          if (body !== null) return { kind: 'review', row: element, body: body }
+        }
         const parent = element.parentElement
         if (parent !== null && parent.getAttribute !== undefined && parent.hasAttribute('data-diff') === false) {
           const root = parent.parentElement
@@ -9612,6 +9706,49 @@ window.__ModuleLoader__.load({
       return { rows: rows, kinds: kinds }
     }
 
+    /* The review renderer's rows carry their printed numbers already: read
+       them straight off the selected rows (unified: old then new; split with
+       wrap: the two cells; split without wrap: one side per column). This is
+       simpler and more accurate than replaying kinds, and it follows the
+       SPLIT view, where one row is two files' lines. */
+    function reviewRowSpanOf(body, fromRow, toRow) {
+      if (body === null || body === undefined) return null
+      const rows = Array.prototype.slice.call(body.querySelectorAll('[data-diff-line]'))
+      const fromIndex = rows.indexOf(fromRow)
+      const toIndex = rows.indexOf(toRow)
+      if (fromIndex < 0 || toIndex < 0) return null
+      let newFrom = null
+      let newTo = null
+      let oldFrom = null
+      let oldTo = null
+      const read = (node) => {
+        const text = node === undefined || node === null ? '' : String(node.textContent).trim()
+        if (text === '') return null
+        const value = Number.parseInt(text, 10)
+        return Number.isFinite(value) ? value : null
+      }
+      for (let index = Math.min(fromIndex, toIndex); index <= Math.max(fromIndex, toIndex); index += 1) {
+        const row = rows[index]
+        const numbers = row.querySelectorAll('.dig-lf-number')
+        let oldLine = null
+        let newLine = null
+        if (row.classList.contains('dig-lf-sideLine') === true) {
+          const side = row.closest === undefined ? null : row.closest('[data-diff-side]')
+          const value = read(numbers[0])
+          if (side !== null && side.getAttribute('data-diff-side') === 'left') oldLine = value
+          else newLine = value
+        } else {
+          oldLine = read(numbers[0])
+          newLine = read(numbers[1])
+        }
+        if (oldLine !== null) { oldFrom = oldFrom === null ? oldLine : oldFrom; oldTo = oldLine }
+        if (newLine !== null) { newFrom = newFrom === null ? newLine : newFrom; newTo = newLine }
+      }
+      if (newFrom !== null) return { start: newFrom, end: newTo === null ? newFrom : newTo, old: false }
+      if (oldFrom !== null) return { start: oldFrom, end: oldTo === null ? oldFrom : oldTo, old: true }
+      return null
+    }
+
     /* { kind: 'lines', span } for a selection inside ONE diff body, or
        { kind: 'snippet' } when the rows are there but the numbers cannot be
        reconstructed. null (rows missing entirely) means "not a diff
@@ -9623,7 +9760,9 @@ window.__ModuleLoader__.load({
       if (from === null || to === null) return null
       if (from.kind !== to.kind || from.body !== to.body) return { kind: 'snippet', text: saved.text }
       let span = null
-      if (from.kind === 'drawn') {
+      if (from.kind === 'review') {
+        span = reviewRowSpanOf(from.body, from.row, to.row)
+      } else if (from.kind === 'drawn') {
         const rows = diffLines(patch)
         const all = from.body === null || from.body === undefined ? [] : Array.prototype.slice.call(from.body.querySelectorAll('.dig-diff-line'))
         const fromIndex = all.indexOf(from.row)
@@ -9645,55 +9784,19 @@ window.__ModuleLoader__.load({
     }
 
 
-    /* DiffBlock's own 16-line cap would REPLACE scrolling with a fold button;
-       this panel keeps the old contract (render everything, scroll inside the
-       .dig-diff-pane max-height), so the cap is pushed out of reach and the
-       fold labels below are placeholders that never render at this size. */
-    const DIFF_BLOCK_MAX_LINES = 1000000
-
-    function diffLabelsOf(t) {
-      return {
-        codeLabel: t('diff.codeLabel'),
-        wrapLabel: t('diff.wrapLabel'),
-        unwrapLabel: t('diff.unwrapLabel'),
-        copy: t('diff.copy'),
-        copied: t('diff.copied'),
-        collapseAria: 'Collapse diff',
-        expandAria: (hidden) => 'Show ' + String(hidden) + ' more diff lines',
-        collapse: 'Show less',
-        expand: (hidden) => 'Show ' + String(hidden) + ' more',
-      }
-    }
-
+    /* The inline pane body and the native preview tab share ONE renderer:
+       LineDiff is the ported official ReviewTab/FileDiff and carries the
+       split / wrap toolbar (issue #22). The former host DiffBlock body only
+       had wrap / copy, so turning the external hand-off off silently dropped
+       the 分栏 switch the user had asked for. One renderer also keeps both
+       diff surfaces visually identical. */
     function DiffBody(props) {
-      const rows = useMemo(() => diffLines(props.patch), [props.patch])
-      if (props.loading === true) return E('div', { className: 'dig-empty' }, props.t('diff.loading'))
-      if (props.binary === true) return E('div', { className: 'dig-empty' }, props.t('diff.binary'))
-      if (rows.length === 0) return E('div', { className: 'dig-empty' }, props.t('diff.empty'))
-      /* Host-rendered first (v0.14): the ui-primitives diff card brings the
-         shared toolbar (copy / wrap / language) and the product's diff colors.
-         A patch we cannot replay into a hunk (binary, mode-only) or a host
-         without the seed module falls back to the hand-drawn rows below. This
-         IS the official diff renderer (the platform seed table ships it, the
-         host's own surfaces render diffs through it) — the external preview
-         tab uses the same one, so every diff in the product reads alike. */
-      if (UIPrimitives !== null && typeof UIPrimitives.DiffBlock === 'function') {
-        const hunk = patchToHunk(props.patch)
-        if (hunk !== null) {
-          return E('div', { className: 'dig-diff-host' },
-            E(UIPrimitives.DiffBlock, {
-              diffs: [hunk],
-              labels: diffLabelsOf(props.t),
-              maxLines: DIFF_BLOCK_MAX_LINES,
-              className: 'dig-diff-card',
-            }))
-        }
-      }
-      return E('div', { className: 'dig-diff' }, rows.map((row, index) => E('div', { key: index, className: 'dig-diff-line dig-diff-' + row.kind },
-        E('span', { className: 'dig-diff-gutter' }, row.oldLine === null ? '' : String(row.oldLine)),
-        E('span', { className: 'dig-diff-gutter' }, row.newLine === null ? '' : String(row.newLine)),
-        E('span', { className: 'dig-diff-text' }, row.text === '' ? ' ' : row.text),
-      )))
+      return E(LineDiff, {
+        patch: props.patch,
+        loading: props.loading,
+        t: props.t,
+        onOpenFile: props.onOpenFile,
+      })
     }
 
     /* ---- external preview diff (v0.14.3): a faithful port of the review view ----
@@ -10891,6 +10994,43 @@ window.__ModuleLoader__.load({
               E('span', { className: 'dig-settings-glyph' }, E(Icon, { name: 'branch', size: 13 })),
               E('span', { id: inputId + '-label', className: 'dig-settings-label', onClick: toggle }, t('settings.composer.title'))),
             E('div', { className: 'dig-settings-subnote' }, t('settings.composer.hint')))
+        })(),
+        (() => {
+          /* Inline diff preview (issue #22): ON keeps the panel's own diff pane
+             reachable, including its split / wrap switches. OFF restores the
+             external hand-off to dsh-better-sidebar or the native preview seat.
+             Same optimistic-write contract as the three rows above. */
+          const field = 'inlineDiff'
+          const inputId = 'dig-placement-' + field
+          const shown = placementShown(field)
+          const toggle = (event) => {
+            if (readOnly === true) { setNote(t('settings.rail.readonly')); return }
+            const fromControl = event !== undefined && event !== null && event.target !== null
+              && event.target !== undefined && typeof event.target.checked === 'boolean'
+              ? event.target.checked
+              : null
+            const wanted = placementTarget(field, fromControl)
+            intent.current[field] = wanted
+            dirty.current.set(field, wanted)
+            setPending((now) => Object.assign({}, now, { [field]: wanted }))
+            setNote('')
+            bump()
+            scheduleFlush()
+          }
+          return E('div', { key: field },
+            E('div', { className: 'dig-settings-row', 'data-placement-row': field },
+              E('input', {
+                id: inputId,
+                type: 'checkbox',
+                className: 'dig-settings-check',
+                'aria-labelledby': inputId + '-label',
+                checked: shown,
+                disabled: readOnly === true,
+                onChange: toggle,
+              }),
+              E('span', { className: 'dig-settings-glyph' }, E(Icon, { name: 'diff', size: 13 })),
+              E('span', { id: inputId + '-label', className: 'dig-settings-label', onClick: toggle }, t('settings.diff.inline'))),
+            E('div', { className: 'dig-settings-subnote' }, t('settings.diff.inlineHint')))
         })()),
         /* Section 3 — the AI commit message (issue #6): model, reasoning and the
            prompt template. */
@@ -12999,6 +13139,9 @@ window.__ModuleLoader__.load({
       const [commits, setCommits] = useState([])
       const [hasMore, setHasMore] = useState(false)
       const [error, setError] = useState(null)
+      /* Named failure code (push-rejected / pull-conflict / ...), kept beside
+         the raw message so the banner can lead with an actionable sentence. */
+      const [errorCode, setErrorCode] = useState(null)
       const [note, setNote] = useState(null)
       const [busy, setBusy] = useState(false)
       const [view, setView] = useState('history')
@@ -13342,10 +13485,13 @@ window.__ModuleLoader__.load({
       const guard = useCallback(async (work) => {
         setBusy(true)
         setError(null)
+        setErrorCode(null)
         try {
           return await work()
         } catch (caught) {
-          setError(caught instanceof Error ? caught.message : String(caught))
+          const failure = caught instanceof Error ? caught : new Error(String(caught))
+          setError(failure.message)
+          setErrorCode(typeof failure.code === 'string' ? failure.code : null)
           return undefined
         } finally {
           setBusy(false)
@@ -13390,7 +13536,7 @@ window.__ModuleLoader__.load({
             writePaintRepos(cwd, data)
             apply(data, readPaintRoot(cwd))
           } catch (caught) {
-            if (!cancelled) setError(caught instanceof Error ? caught.message : String(caught))
+            if (!cancelled) { setErrorCode(null); setError(caught instanceof Error ? caught.message : String(caught)) }
           }
         })()
         return () => { cancelled = true }
@@ -13418,6 +13564,7 @@ window.__ModuleLoader__.load({
           const data = await request('gitLogs', {})
           setGitOutput(Array.isArray(data.entries) ? data.entries : [])
         } catch (caught) {
+          setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
         }
       }, [request])
@@ -13643,7 +13790,11 @@ window.__ModuleLoader__.load({
 
       const run = useCallback(async (method, payload) => {
         const result = await guard(() => request(method, Object.assign({}, base, payload)))
-        if (result !== undefined) {
+        /* A failed pull/push still changes repository state (merge conflicts,
+           or a merge that landed before the push was rejected), so refresh on
+           those failures too — otherwise the Changes list hides the conflict
+           files the banner is asking the user to resolve. */
+        if (result !== undefined || method === 'pull' || method === 'push') {
           await refresh()
           /* v0.21.2: the composer pill is a separate tree; without this it only
              learned about an in-panel checkout/commit at the next 30s poll. The
@@ -13704,6 +13855,7 @@ window.__ModuleLoader__.load({
           const data = await request('diff', Object.assign({}, base, seed))
           setPatch(data.patch)
         } catch (caught) {
+          setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
         } finally {
           setPatchLoading(false)
@@ -13722,6 +13874,11 @@ window.__ModuleLoader__.load({
          repoRoot 并进它自己的 git 调用,多仓库工作区不会落错仓库。 */
       const previewDiff = useCallback((seed) => {
         if (repoRoot === null) return false
+        /* Inline-first (issue #22): the switch defaults to ON, so the panel's
+           own diff pane — and its split / wrap controls — is what a click
+           opens. Turning it off hands the preview to the external chain
+           below, which is the only behaviour older releases had. */
+        if (inlineDiffEnabled() === true) return false
         const commitHash = seed.hash !== undefined && seed.hash !== null ? String(seed.hash) : null
         const ref = commitHash !== null
           ? { kind: 'commit', hash: commitHash.slice(0, 7), hashFull: commitHash, subject: seed.subject || '', worktree: repoRoot, repoRoot: repoRoot }
@@ -13801,6 +13958,7 @@ window.__ModuleLoader__.load({
         try {
           setDetail(await request('commitDetail', Object.assign({}, base, { hash: commit.hash })))
         } catch (caught) {
+          setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
         }
       }, [base])
@@ -13973,6 +14131,7 @@ window.__ModuleLoader__.load({
       const createWorktree = async (draft) => {
         setBusy(true)
         setError(null)
+        setErrorCode(null)
         try {
           await request('worktreeAdd', Object.assign({}, base, draft))
           setDialog(null)
@@ -13988,6 +14147,7 @@ window.__ModuleLoader__.load({
       const removeWorktree = async (tree, force) => {
         setBusy(true)
         setError(null)
+        setErrorCode(null)
         try {
           await request('worktreeRemove', Object.assign({}, base, { path: tree.path, confirm: true, force: force === true }))
           setDialog(null)
@@ -14001,6 +14161,7 @@ window.__ModuleLoader__.load({
             return message
           }
           setDialog(null)
+          setErrorCode(null)
           setError(message)
           return message
         } finally {
@@ -14010,6 +14171,7 @@ window.__ModuleLoader__.load({
       const pruneWorktrees = async () => {
         setBusy(true)
         setError(null)
+        setErrorCode(null)
         try {
           const data = await request('worktreePrune', Object.assign({}, base, { confirm: true }))
           setDialog(null)
@@ -14018,6 +14180,7 @@ window.__ModuleLoader__.load({
           return data
         } catch (caught) {
           setDialog(null)
+          setErrorCode(null)
           setError(caught instanceof Error ? caught.message : String(caught))
           return null
         } finally {
@@ -14198,7 +14361,26 @@ window.__ModuleLoader__.load({
           ].filter((item) => item !== null))
           return
         }
-        const updateItem = { id: 'update', icon: 'fetch', tone: 'cyan', label: t('action.update'), run: () => { void run('fetch', { prune: true }) } }
+        /* v0.24.0: the label was always 拉取, but this only ran git fetch.
+           The checked-out branch now takes a real pull (merge, the new
+           default); a non-HEAD branch keeps the safe refspec update, because
+           git pull would merge into HEAD instead of into that branch. */
+        const updateItem = {
+          id: 'update', icon: 'fetch', tone: 'cyan', label: t('action.update'),
+          run: () => {
+            if (entry.head === true) {
+              const upstream = entry.upstream
+              if (upstream === null || upstream === undefined || upstream === '') { void run('fetch', { prune: true }); return }
+              void run('pull', { mode: 'merge' })
+              return
+            }
+            const upstream = entry.upstream
+            if (upstream === null || upstream === undefined || upstream === '') { void run('fetch', { prune: true }); return }
+            const slash = upstream.indexOf('/')
+            const remote = slash >= 0 ? upstream.slice(0, slash) : upstream
+            void run('fetch', { remote: remote, branch: entry.name + ':' + entry.name })
+          },
+        }
         const pushItem = { id: 'push', icon: 'push', tone: 'success', label: t('action.push'), disabled: blocked, reason: t('operation.hint'), run: () => setDialog({ kind: 'push' }) }
         const items = [
           { id: 'checkout', icon: 'checkout', tone: 'accent', label: t('action.checkout'), disabled: entry.head === true || entry.tag === true || blocked, reason: blocked ? t('operation.hint') : reason, run: () => { void checkout(entry) } },
@@ -14601,9 +14783,29 @@ window.__ModuleLoader__.load({
         E('span', { className: 'dig-topbar-spacer' }),
         busy ? E('span', { className: 'dig-busy' }, t('status.busy')) : null)
 
+      /* Named git failures get a sentence that says what to do; the raw git
+         output stays one hover away in the title. The two recoverable ones
+         (push rejected, ff-only divergence) also offer the exact next action:
+         Sync = pull with merge, then push again. */
+      const errorHint = errorCode === 'push-rejected' ? t('error.pushRejected')
+        : errorCode === 'pull-diverged' ? t('error.pullDiverged')
+          : errorCode === 'pull-conflict' ? t('error.pullConflict')
+            : errorCode === 'pull-dirty' ? t('error.pullDirty')
+              : null
+      const syncFromBanner = () => {
+        setError(null)
+        setErrorCode(null)
+        void (async () => {
+          const pulled = await run('pull', { mode: 'merge' })
+          if (pulled !== undefined) await run('push', { confirm: true })
+        })()
+      }
       const banner = error === null ? null : E('div', { className: 'dig-banner' },
-        E('span', { className: 'dig-banner-text' }, error),
-        E('button', { type: 'button', className: 'dig-link', onClick: () => setError(null) }, t('error.dismiss')))
+        E('span', { className: 'dig-banner-text', title: errorHint === null ? undefined : error }, errorHint === null ? error : errorHint),
+        errorHint !== null && (errorCode === 'push-rejected' || errorCode === 'pull-diverged')
+          ? E('button', { type: 'button', className: 'dig-link', onClick: syncFromBanner }, t('more.sync'))
+          : null,
+        E('button', { type: 'button', className: 'dig-link', onClick: () => { setError(null); setErrorCode(null) } }, t('error.dismiss')))
 
       const noteBanner = note === null ? null : E('div', { className: 'dig-note' },
         E('span', { className: 'dig-banner-text' }, note),
@@ -14795,7 +14997,7 @@ window.__ModuleLoader__.load({
           ] },
           null,
           /* —— top-level sync (VS Code header row) —— */
-          { id: 'mm-pull', icon: 'pull', tone: 'accent', label: t('toolbar.pull'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void run('pull', { mode: 'ff-only' }) } },
+          { id: 'mm-pull', icon: 'pull', tone: 'accent', label: t('toolbar.pull'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void run('pull', { mode: 'merge' }) } },
           { id: 'mm-push', icon: 'push', tone: 'success', label: t('toolbar.push'), disabled: remoteReady !== true || blocked, reason, run: () => setDialog({ kind: 'push' }) },
           { id: 'mm-clone', icon: 'plus', tone: 'secondary', label: t('more.clone'), run: () => setDialog({ kind: 'clone' }) },
           { id: 'mm-checkout', icon: 'checkout', tone: 'accent', label: t('action.checkout') + '...', disabled: otherBranches.length === 0 || blocked, reason, run: (ev) => pickBranchMenu(ev, 'checkout') },
@@ -14824,12 +15026,12 @@ window.__ModuleLoader__.load({
           ] },
           /* —— SCM ▸ Pull, Push ▸ —— */
           { id: 'sub-pullpush', icon: 'pull', tone: 'accent', label: t('more.pullpushGroup'), items: [
-            { id: 'pp-sync', label: t('more.sync'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void (async () => { await run('pull', { mode: 'ff-only' }); await run('push', { confirm: true }) })() } },
+            { id: 'pp-sync', label: t('more.sync'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void (async () => { await run('pull', { mode: 'merge' }); await run('push', { confirm: true }) })() } },
             { id: 'pp-sync-rebase', label: t('more.syncRebase'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void (async () => { await run('pull', { mode: 'rebase' }); await run('push', { confirm: true }) })() } },
             null,
-            { id: 'pp-pull', label: t('toolbar.pull'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void run('pull', { mode: 'ff-only' }) } },
+            { id: 'pp-pull', label: t('toolbar.pull'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void run('pull', { mode: 'merge' }) } },
             { id: 'pp-pull-rebase', label: t('more.pullRebase'), disabled: remoteReady !== true || tracked !== true || blocked, reason, run: () => { void run('pull', { mode: 'rebase' }) } },
-            { id: 'pp-pull-from', label: t('more.pullFrom'), disabled: remoteNames.length === 0, reason, run: pickRemote((name) => { void run('pull', { mode: 'ff-only', remote: name }) }) },
+            { id: 'pp-pull-from', label: t('more.pullFrom'), disabled: remoteNames.length === 0, reason, run: pickRemote((name) => { void run('pull', { mode: 'merge', remote: name }) }) },
             null,
             { id: 'pp-push', label: t('toolbar.push'), disabled: remoteReady !== true || blocked, reason, run: () => setDialog({ kind: 'push' }) },
             { id: 'pp-push-force', label: t('more.pushForce'), danger: true, disabled: remoteReady !== true || blocked, reason, run: () => setDialog({ kind: 'pushForce' }) },
@@ -14956,7 +15158,7 @@ window.__ModuleLoader__.load({
       const pullPickedBranches = async (picked) => {
         for (const item of picked) {
           if (item.kind !== 'local') continue
-          if (item.entry.head === true) { await run('pull', { mode: 'ff-only' }); continue }
+          if (item.entry.head === true) { await run('pull', { mode: 'merge' }); continue }
           const upstream = item.entry.upstream
           if (upstream === null || upstream === undefined || upstream === '') continue
           const slash = upstream.indexOf('/')
@@ -15015,7 +15217,7 @@ window.__ModuleLoader__.load({
         }
         else if (spec.id === 'pull') {
           if (railPickedLocals.length > 0) { entry.label = fill(t('toolbar.pullPicked'), { n: railPickedLocals.length }); entry.disabled = blocked; entry.run = () => { void pullPickedBranches(railPickedLocals) } }
-          else { entry.disabled = remoteReady !== true || tracked !== true || blocked; entry.run = () => { void run('pull', { mode: 'ff-only' }) } }
+          else { entry.disabled = remoteReady !== true || tracked !== true || blocked; entry.run = () => { void run('pull', { mode: 'merge' }) } }
         }
         else if (spec.id === 'push') {
           if (railPickedLocals.length > 0) { entry.label = fill(t('toolbar.pushPicked'), { n: railPickedLocals.length }); entry.disabled = blocked; entry.run = () => setDialog({ kind: 'pushMany', items: railPickedLocals.map((item) => ({ name: item.name, upstream: item.entry.upstream })) }) }
@@ -16355,6 +16557,18 @@ window.__ModuleLoader__.load({
       return value !== false
     }
 
+    /* Inline-first diff preview (issue #22). Default ON: the panel's own diff
+       pane owns the split / wrap switches, so installing dsh-better-sidebar or
+       opening the native preview seat must not silently take that capability
+       away. The settings card flips this field; false restores the external
+       hand-off chain in previewDiff. */
+    function inlineDiffEnabled() {
+      const ready = railFormReady()
+      if (ready === null) return true
+      const value = ready.value !== null && typeof ready.value === 'object' ? ready.value.inlineDiff : undefined
+      return value !== false
+    }
+
     const COMPOSER_POLL_MS = 30000
     const COMPOSER_ERROR_TTL_MS = 6000
     /* Line counts re-run at most this often without a real change: the two
@@ -17201,9 +17415,9 @@ window.__ModuleLoader__.load({
        diff — whatever the store holds — fetched fresh from the host route on
        every seed. The seed carries cwd + repoRoot so a multi-root workspace
        lands on the right repository (the route requires cwd; repoRoot skips
-       the rev-parse). Rendered through the SAME DiffBody the inline pane uses,
-       so host DiffBlock reuse, the hand-drawn fallback and the binary/empty
-       states are all identical. */
+       the rev-parse). Rendered through the SAME LineDiff the inline pane's
+       DiffBody uses, so the header tool set (split / wrap / open file) and
+       the binary/empty states are identical on both surfaces. */
     function NativePreviewPanel(props) {
       const t = props.t
       const [seed, setSeed] = useState(() => previewStore.seed)