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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « buildbot/buildbot_spec2k.sh ('k') | tools/llvm/merge-tool.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/llvm/hgrc
===================================================================
--- tools/llvm/hgrc (revision 0)
+++ tools/llvm/hgrc (revision 0)
@@ -0,0 +1,11 @@
+[paths]
+default = https://code.google.com/p/nacl-llvm-branches.upstream
+
+[web]
+push_ssl = false
+allow_push = *
+
+[merge-tools]
+kdiff3.executable = /usr/bin/kdiff3
+kdiff3.args = --auto --base $base $local $other -o $output
+kdiff3.priority = 0
« 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