← Back to branch summary

~ubuntu-branches/ubuntu/wily/phabricator/wily

« back to all changes in this revision

Viewing changes to src/parser/__tests__/diff/svn-property-merge.svndiff

  • Committer: Package Import Robot
  • Author(s): Richard Sellam
  • Date: 2014-11-01 23:20:06 UTC
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: package-import@ubuntu.com-20141101232006-mvlnp0cil67tsboe
Tags: upstream-0~git20141101/arcanist
Import upstream version 0~git20141101, component arcanist

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/parser/__tests__/diff/svn-property-merge.svndiff
 
1
Property changes on: html/js/help/UIFaq-Moo.js
 
2
___________________________________________________________________
 
3
Added: svn:mergeinfo
 
4
   Merged /tfb/branches/internmove/www/html/js/help/UIFaq.js:r83462-126155
 
5
   Merged /tfb/branches/ads-create-v3/www/html/js/help/UIFaq.js:r140558-142418