Mercurial > hg4j

comparison src/org/tmatesoft/hg/repo/HgMergeState.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 6526d8adbc0f
children 42b88709e41d
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
216 return stateParent; 216 return stateParent;
217 } 217 }
218 218
219 /** 219 /**
220 * List of conflicts as recorded in the merge state information file. 220 * List of conflicts as recorded in the merge state information file.
221 * Note, this information is valid unless {@link #isStale()} is <code>true</code>. 221 * Note, this information is not valid unless {@link #isStale()} is <code>true</code>.
222 * 222 *
223 * @return non-<code>null</code> list with both resolved and unresolved conflicts. 223 * @return non-<code>null</code> list with both resolved and unresolved conflicts.
224 */ 224 */
225 public List<Entry> getConflicts() { 225 public List<Entry> getConflicts() {
226 return entries == null ? Collections.<Entry>emptyList() : Arrays.asList(entries); 226 return entries == null ? Collections.<Entry>emptyList() : Arrays.asList(entries);