record revisions that were manually merged

Browse Source

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153746 65c4cc65-6c06-0410-ace0-fbb531ad65f3

...

This commit is contained in:

Kevin P. Fleming

2008-11-03 00:53:10 +00:00

parent ede179faec

commit 090cd16d68

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