/[volute]/trunk/projects/theory/snapdm/diff.properties
ViewVC logotype

Annotation of /trunk/projects/theory/snapdm/diff.properties

Parent Directory Parent Directory | Revision Log Revision Log


Revision 621 - (hide annotations)
Wed Jun 25 15:43:56 2008 UTC (12 years, 6 months ago) by bourges.laurent
File size: 1058 byte(s)
added a simple ant script to realize folder diff / merge with external tool
1 bourges.laurent 621 # ------------------------------------------------
2     # Human writable properties for diff ant script :
3     # ------------------------------------------------
4    
5     # Left folder to compare [MASTER] :
6     dir.left =../simdb-browser
7    
8     # right folder to compare :
9     dir.right =./webapp/simdb-browser
10    
11    
12     # ------------------------------------------------
13    
14     ## Change DIFFMERGE_PATH to point to where you installed DiffMerge
15     DIFFMERGE_PATH=/Applications/DiffMerge.app
16    
17     ## The actual executable is hidden inside the .app bundle.
18     DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge
19    
20     ## Launch DiffMerge using the given command line arguments. Use --help for
21     ## additional information or see the man page distributed along with this
22     ## shell script.
23    
24    
25    
26     # ------------------------------------------------
27     # merge command :
28    
29     merge.cmd =${DIFFMERGE_EXE}
30    
31     ## MacOS FileMerge standard application :
32     # merge.cmd =/usr/bin/opendiff
33    
34    
35     # ------------------------------------------------
36    
37     # open file browser command :
38     open.cmd =open
39    
40    
41     # --------------------------------------------------

msdemlei@ari.uni-heidelberg.de
ViewVC Help
Powered by ViewVC 1.1.26