Mercurial > jhg

comparison src/org/tmatesoft/hg/repo/HgManifest.java @ 707:42b88709e41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: support 'unresolved' resolution with MergeStateBuilder
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Fri, 16 Aug 2013 19:22:59 +0200
parents 5d8798772cca
children
comparison
equal deleted inserted replaced
706:cd5c87d96315 707:42b88709e41d
120 return Exec; 120 return Exec;
121 } 121 }
122 return RegularFile; 122 return RegularFile;
123 } 123 }
124 124
125 String nativeString() { 125 /**
126 * String representation of the flag as of native Mercurial client.
127 */
128 public String mercurialString() {
126 if (this == Exec) { 129 if (this == Exec) {
127 return "x"; 130 return "x";
128 } 131 }
129 if (this == Link) { 132 if (this == Link) {
130 return "l"; 133 return "l";