Resolving conflict in colorize patch #7742

Browse source

...

This commit is contained in:

Robby Russell 2019-12-20 22:43:20 -08:00

parent 16ef5cca44 67e0ef7aa6

commit c494bbb82c

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files