本周发布了Kaleidoscope 2公测版,并增加了合并功能。太棒了!然而,关于命令行的使用有些含糊不清。我想与Git Tower一起使用Kaleidoscope,该怎么做呢?
$ ksdiff --help
usage: ksdiff - send files to Kaleidoscope
command options:
[--wait, -w | --no-wait] whether to wait for the document to be
closed in Kaleidoscope before exiting
FILE options:
[--snapshot | --no-snapshot] whether the file is temporary. this
option will override the heuristics
ksdiff would otherwise use to determine
this state.
commands:
--merge send a merge
implies --wait
--output OUTPUT use OUTPUT as the destination path for
this merge. creates OUTPUT if it does
not exist.
[--base BASE] use BASE as the base content for this
merge. can improve the quality of the
default selections for some merges.
FILE FILE the files to merge