tools: fix accidentally recorded conflict markers

Browse Source

...

This commit is contained in:

Simon Michael 2010-12-10 22:34:01 +00:00

parent 5fe830d703

commit 84b251c534

1 changed files with 23 additions and 12 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

35

Makefile

View File

File diff suppressed because one or more lines are too long