| commit | 1a5dc8fe641e3dc9b960b6d8d9eac82af80f64c0 | |
| author | Ilia Maslakov <il.smind@gmail.com> | |
| Thu, 30 Aug 2012 13:14:27 +0000 (30 17:14 +0400) | ||
| committer | Ilia Maslakov <il.smind@gmail.com> | |
| Thu, 30 Aug 2012 13:14:27 +0000 (30 17:14 +0400) | ||
| tree | 18bb96f183cbc692dd60ba26278fc26fe0fc73f8 | treesnapshot (tar.gz zip) |
| parent | 961019d07820bc8c11e7f6d5781a5c04c597c8f4 | commitdiff |
| parent | 7d347752314d41e225f58c503373ca85694b62ac | commitdiff |
Merge branch '2863_mcdiff_merge_enhance'
* 2863_mcdiff_merge_enhance:
fixed the doxygen documentation.
Added doxygen comments
Added diff_place_t enum.
Added action_direction_t type
Ticket #2863 (mcdiff bidirectional merge enhancement)
* 2863_mcdiff_merge_enhance:
fixed the doxygen documentation.
Added doxygen comments
Added diff_place_t enum.
Added action_direction_t type
Ticket #2863 (mcdiff bidirectional merge enhancement)