ilyasKerbal

After installing it http://sourceforge.net/projects/meld-installer/
I had to tell git where it was:
git config --global merge.tool meld
git config --global diff.tool meld
git config --global mergetool.meld.path “C:\Program Files (x86)\Meld\meld\meld.exe”

And that seems to work.  Both merging and diffing with “git difftool” or “git mergetool”

ilyasKerbal

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

	<ProgressBar
              android:id="@+id/progress_limit"
                    style="?android:attr/progressBarStyleHorizontal"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"

ilyasKerbal

// FIT LAYER TO CANVAS
// via https://forums.adobe.com/message/5413957#5413957
var maintainAspectRatio;// set to true to keep aspect ratio  
if(app.documents.length>0){  
    app.activeDocument.suspendHistory ('Fit Layer to Canvas', 'FitLayerToCanvas('+maintainAspectRatio+')');  
}  
function FitLayerToCanvas( keepAspect ){// keepAspect:Boolean - optional. Default to false  
    var doc = app.activeDocument;  
    var layer = doc.activeLayer;  
    // do nothing if layer is background or locked