lukechilds
/
dotfiles
mirror of https://github.com/lukechilds/dotfiles.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

iterm: Add useful trigger to highlight git merge conflicts

master
Nick Plekhanov 8 years ago
parent
59ffb3f454
commit
80d47a36fa
1 changed files with 28 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      iterm/com.googlecode.iterm2.plist

33
iterm/com.googlecode.iterm2.plist
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save