← Back to branch summary

~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to .pc/deb_specific__mergetools/contrib/mergetools.hgrc

  • Committer: Bazaar Package Importer
  • Author(s): Vincent Danjean, Javi Merino, Vincent Danjean
  • Date: 2010-07-04 09:55:28 UTC
  • mfrom: (1.2.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100704095528-bzag1mhfylss9zth
Tags: 1.6-1
http://bugs.debian.org/586907
http://bugs.debian.org/585250
[ Javi Merino ]
* New upstream release (1.6). Many bug fixes and improvements. Among
    them:
  - push: break infinite http recursion bug with Python 2.6.5
       (issue2179 and issue2255) (Closes: #586907)
  - zeroconf: Don't use string exceptions (Closes: #585250)
* Removed patch for_upstream__bashism_in_examples.patch since a fix for
    #581122 is included upstream.
* Updated Standards-Version to 3.9 (no change needed)

[ Vincent Danjean ]
* debian/control:
  + Use Breaks instead of Conflicts
  + Use a fixed version in Replaces
    I put 1.4 but it has been a long time since nothing has been moved
    from mercurial to mercurial-common

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/deb_specific__mergetools/contrib/mergetools.hgrc
6
6
kdiff3.regappend=\kdiff3.exe
7
7
kdiff3.fixeol=True
8
8
kdiff3.gui=True
 
9
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
9
10
 
10
11
gvimdiff.args=--nofork -d -g -O $local $other $base
11
12
gvimdiff.regkey=Software\Vim\GVim
13
14
gvimdiff.priority=-9
14
15
 
15
16
merge.checkconflicts=True
16
 
merge.priority=-10
 
17
merge.priority=-100
17
18
 
18
19
gpyfm.gui=True
19
20
 
20
21
meld.gui=True
21
22
meld.args=--label='local' $local --label='base' $base --label='other' $other
 
23
meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
22
24
 
23
25
tkdiff.args=$local $other -a $base -o $output
24
26
tkdiff.gui=True
25
27
tkdiff.priority=-8
 
28
tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
26
29
 
27
30
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
28
31
xxdiff.gui=True
29
32
xxdiff.priority=-8
 
33
xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
30
34
 
31
35
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
32
36
diffmerge.regname=Location
34
38
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
35
39
diffmerge.checkchanged=True
36
40
diffmerge.gui=True
 
41
diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
37
42
 
38
43
p4merge.args=$base $local $other $output
39
44
p4merge.regkey=Software\Perforce\Environment
41
46
p4merge.regappend=\p4merge.exe
42
47
p4merge.gui=True
43
48
p4merge.priority=-8
 
49
p4merge.diffargs=$parent $child
44
50
 
45
51
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
46
52
tortoisemerge.regkey=Software\TortoiseSVN
47
53
tortoisemerge.checkchanged=True
48
54
tortoisemerge.gui=True
49
55
tortoisemerge.priority=-8
 
56
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
50
57
 
51
58
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
52
59
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
53
60
ecmerge.gui=True
 
61
ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
54
62
 
55
63
filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
56
64
filemerge.args=-left $other -right $local -ancestor $base -merge $output
62
70
beyondcompare3.regname=ExePath
63
71
beyondcompare3.gui=True
64
72
beyondcompare3.priority=-2
 
73
beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
65
74
 
66
75
; Linux version of Beyond Compare
67
76
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
68
77
bcompare.premerge=False
69
78
bcompare.gui=True
70
79
bcompare.priority=-1
 
80
bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
71
81
 
72
82
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
73
83
winmerge.regkey=Software\Thingamahoochie\WinMerge
75
85
winmerge.checkchanged=True
76
86
winmerge.gui=True
77
87
winmerge.priority=-10
 
88
winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
78
89
 
79
90
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
80
91
araxis.regappend=\ConsoleCompare.exe
84
95
araxis.checkconflict=True
85
96
araxis.binary=True
86
97
araxis.gui=True
 
98
araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
 
99
 
 
100
diffuse.priority=-3
 
101
diffuse.args=$local $base $other
 
102
diffuse.gui=True
 
103
diffuse.diffargs=$parent $child
 
104
 
 
105
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
 
106
UltraCompare.args = $base $local $other -title1 base -title3 other
 
107
UltraCompare.priority = -2
 
108
UltraCompare.gui = True
 
109
UltraCompare.binary = True
 
110
UltraCompare.checkconflicts = True
 
111
UltraCompare.checkchanged = True
 
112
UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1