부러우면 지는거다

- WinMerge
[extensions]
[ui]
username = ultralisk
merge = p4merge
[extdiff]
cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe
opts.winmerge = /e /x /ub /wl
[merge-tools]
winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe
winmergeu.priority= 1
winmergeu.fixeol=True
winmergeu.checkchanged=True
winmergeu.args= /e /ub /dl other /dr local $other $local $output
winmergeu.gui=False




- Perforce
[merge-tools]
p4.priority = 100
p4.premerge = True
p4.executable = C:\Program Files\Perforce\p4merge.exe
p4.gui = True
p4.args = $base $local $other $output
[tortoisehg]
vdiff = p4merge