Skip to content

Commit f501e23

Browse files
authored
308 side by side tabs (#459)
* Add #308 bug reproduction delta --no-gitconfig --diff-highlight --side-by-side < etc/examples/308-side-by-side-tabs.diff * Expand tabs under diff-highlight and diff-so-fancy Fixes #308
1 parent 5e39a0e commit f501e23

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git .config/git/config .config/git/config
2+
index bc4ae2e..b058f99 100644
3+
--- .config/git/config
4+
+++ .config/git/config
5+
@@ -26,7 +21,6 @@
6+
# Show summary of changes to submodules. See also:
7+
# https://git-scm.com/book/en/v2/Git-Tools-Submodules
8+
submoduleSummary = true
9+
- showStash = true
10+
11+
[diff]
12+
tool = vimdiff

src/features/diff_highlight.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@ pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
77

88
pub fn _make_feature(bold: bool) -> Vec<(String, OptionValueFunction)> {
99
let mut feature = raw::make_feature();
10+
feature = feature
11+
.into_iter()
12+
.filter(|(s, _)| s != "keep-plus-minus-markers" && s != "tabs")
13+
.collect();
1014
feature.extend(builtin_feature!([
11-
(
12-
"keep-plus-minus-markers",
13-
bool,
14-
None,
15-
_opt => false
16-
),
1715
(
1816
"minus-style",
1917
String,

0 commit comments

Comments
 (0)