Commit 35357e0
committed
cmd-diff: support
Having vimdiff is a lot more powerful to me because you can manually
do a few things in the terminal to massage the files on each side of the
diff to give you more information (i.e. narrow in on exactly what diff
you are interested in). Let's add a --difftool boolean flag to trigger
`git difftool`, which will allow diffs to be displayed using vimdiff.
Additionally include vim-enhanced so we have `vimdiff` installed and
at our disposal.git difftool so we can utilize vimdiff1 parent be27517 commit 35357e0
2 files changed
+17
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
57 | 62 | | |
58 | 63 | | |
59 | 64 | | |
60 | 65 | | |
61 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
62 | 71 | | |
63 | 72 | | |
64 | 73 | | |
| |||
114 | 123 | | |
115 | 124 | | |
116 | 125 | | |
| 126 | + | |
117 | 127 | | |
118 | 128 | | |
119 | 129 | | |
| |||
424 | 434 | | |
425 | 435 | | |
426 | 436 | | |
427 | | - | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
428 | 441 | | |
429 | 442 | | |
430 | 443 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
0 commit comments