summaryrefslogtreecommitdiff
path: root/git/merge.sh
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-06-03 18:28:36 +0200
commit829051104d5544c56b49ebfa181b092cc5e698f3 (patch)
tree5714e43be0bcc5668ddb0068b8d7054023ef35ba /git/merge.sh
parentb817f51fbec5d9cfcf40a14b16c80a7026bdf640 (diff)
Support for VC12 (2013), initial work
Diffstat (limited to 'git/merge.sh')
0 files changed, 0 insertions, 0 deletions