Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: tools/llvm/hgrc

Issue 7524023: New LLVM merging bots (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « buildbot/buildbot_spec2k.sh ('k') | tools/llvm/merge-tool.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 [paths]
2 default = https://code.google.com/p/nacl-llvm-branches.upstream
3
4 [web]
5 push_ssl = false
6 allow_push = *
7
8 [merge-tools]
9 kdiff3.executable = /usr/bin/kdiff3
10 kdiff3.args = --auto --base $base $local $other -o $output
11 kdiff3.priority = 0
OLDNEW
« no previous file with comments | « buildbot/buildbot_spec2k.sh ('k') | tools/llvm/merge-tool.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698