diff options
| author | scott Chacon <schacon@agadorsparticus.corp.reactrix.com> | 2007-11-29 11:16:14 -0800 |
|---|---|---|
| committer | scott Chacon <schacon@agadorsparticus.corp.reactrix.com> | 2007-11-29 11:16:14 -0800 |
| commit | 8185e202dfe6a70fb04d3eec7826e4ea54866c4a (patch) | |
| tree | 908539c1092cf3231b58d1b4d60c4b11b1d1e649 /tests/units | |
| parent | c6db2b7c34eb98a38047fca8fbef4a39279eaf08 (diff) | |
applied a patch by mateusz jedruch <mateusz.jedruch@gmail.com> for iterating through merge conflicts
Diffstat (limited to 'tests/units')
0 files changed, 0 insertions, 0 deletions