QA SoftVision Team/Mobile/Robocop automation setup: Difference between revisions

QA SoftVision Team/Mobile/Robocop automation setup (view source)

589 bytes removed , 16 October 2013

Confirmed users

905

edits

@@ Line 18: / Line 18: @@
 = Detailed steps =
-== Install kDiff ==
-* kDiff3 is a merge tool that can verify the differences between the source codes allowing the user to download only the code that is different when updating the source files
-* The easiest way to install kDiff3 is from the Ubuntu Software Manager
 == Install Java ==
@@ Line 64: / Line 60: @@
   [ui]
   username = Your Real Name <user@example.com>
-  merge = your-merge-program (or internal:merge)
+  merge = internal:merge
   [diff]
@@ Line 73: / Line 69: @@
   [defaults]
   commit = -v
-=== Configure kDiff as merge tool ===
-* Setting kDiff as the merge tool for Mercuial
-* Add in .hgrc
- [merge-tools]
- kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
- kdiff3.regkey=Software\KDiff3
- kdiff3.regappend=\kdiff3.exe
- kdiff3.fixeol=True
- kdiff3.gui=True
 === Configure mq ===