Produced by Araxis Merge on 4/27/2017 3:18:38 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Thu Apr 27 19:18:38 2017 UTC | ||
| 2 | PRE-Inbound-eRx-2.0.3.040.zip\PS_INB_ERX_Pentaho\target\PS_INB_ERX_Pentaho-2.0.3.DEV-zipfile.zip | .jazzignore | Mon Mar 27 13:19:06 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 34 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | ### Jazz I gnore 0 | |||||
| 2 | # Ignored files and folders wi ll not be committed, but may b e modified during | |||||
| 3 | # accept o r update. | |||||
| 4 | # - Ignore propertie s should c ontain a s pace separ ated list of filenam e patterns . | |||||
| 5 | # - Each p attern is case sensi tive and s urrounded by braces ('{' and ' }'). | |||||
| 6 | # - "*" ma tches zero or more c haracters. | |||||
| 7 | # - "?" ma tches a si ngle chara cter. | |||||
| 8 | # - The pa ttern list may be sp lit across lines by ending the line with a | |||||
| 9 | # back slash and starting t he next li ne with a tab. | |||||
| 10 | # - Patter ns in core .ignore pr event matc hing resou rces in th e same | |||||
| 11 | # dire ctory from being com mitted. | |||||
| 12 | # - Patter ns in core .ignore.re cursive ma tching res ources in the curren t | |||||
| 13 | # dire ctory and all subdir ectories f rom being committed. | |||||
| 14 | # - The de fault valu e of core. ignore.rec ursive is *.class | |||||
| 15 | # - The de fault valu e for core .ignore is bin | |||||
| 16 | # | |||||
| 17 | # To ignor e shell sc ripts and hidden fil es in this subtree: | |||||
| 18 | # e.g: core.igno re.recursi ve = {*.sh } {\.*} | |||||
| 19 | # | |||||
| 20 | # To ignor e resource s named 'b in' in the current d irectory ( but allow | |||||
| 21 | # them in any sub d irectorybe low): | |||||
| 22 | # e.g: core.igno re = {bin} | |||||
| 23 | # | |||||
| 24 | # NOTE: mo difying ig nore files will not change the ignore st atus of | |||||
| 25 | # Ecli pse derive d resource s. | |||||
| 26 | ||||||
| 27 | core.ignor e.recursiv e= | |||||
| 28 | ||||||
| 29 | core.ignor e= \ | |||||
| 30 | {. jazzignore } \ | |||||
| 31 | {I nboundErxK ettleRepoF ullExport0 9192016} \ | |||||
| 32 | {e rx_repo2} \ | |||||
| 33 | {k ettle_jobs _full_expo rt_localRe po09212016 } \ | |||||
| 34 | {k ettle_tran sformation s_full_exp ort_localR epo0921201 6} |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.