Produced by Araxis Merge on 3/29/2017 4:53:34 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 | CTT-DM CIF Submission.zip\code\rails_komet\.git | config | Fri Mar 3 16:22:01 2017 UTC |
| 2 | CTT-DM CIF Submission.zip\code\rails_komet\.git | config | Wed Mar 29 18:22:00 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 22 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| 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 | [core] | |
| 2 | re positoryfo rmatversio n = 0 | |
| 3 | fi lemode = t rue | |
| 4 | ba re = false | |
| 5 | lo gallrefupd ates = tru e | |
| 6 | ig norecase = true | |
| 7 | [remote "o rigin"] | |
| 8 | ur l = https: //devtest@ DNS c. DNS : PORT /git/r/rai ls_komet.g it | |
| 9 | fe tch = +ref s/heads/*: refs/remot es/origin/ * | |
| 10 | [branch "d evelop"] | |
| 11 | re mote = ori gin | |
| 12 | me rge = refs /heads/dev elop |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.