Resolving excess conflicts due to criss-cross in branch history

Browse Source

...

This commit is contained in:

sateesh

2011-03-07 21:11:27 +05:30

parent c37e188f15 cdeb889571

commit 4817f9c019

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available