← Back to branch summary

~taktaktaktaktaktaktaktaktaktak/+junk/monodevelop-hg-2.4

« back to all changes in this revision

Viewing changes to MercurialClient.cs

  • Committer: Levi Bard
  • Date: 2010-12-21 20:22:59 UTC
  • Revision ID: levi@unity3d.com-20101221202259-zbv469h8i8w2eut6
Implement conflicted status check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MercurialClient.cs
217
217
                Unversioned = '?',
218
218
                Unchanged = 'C',
219
219
                Added = 'A',
220
 
                Conflicted = 'Z', // FIXME
 
220
                Conflicted = 'U',
221
221
                Deleted = 'R',
222
222
                Ignored = 'I',
223
223
                Modified = 'M',