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

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
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgManifest.java	Fri Aug 16 14:54:09 2013 +0200
+++ b/src/org/tmatesoft/hg/repo/HgManifest.java	Fri Aug 16 19:22:59 2013 +0200
@@ -122,7 +122,10 @@
 			return RegularFile;
 		}
 		
-		String nativeString() {
+		/**
+		 * String representation of the flag as of native Mercurial client. 
+		 */
+		public String mercurialString() {
 			if (this == Exec) {
 				return "x";
 			}