equal
deleted
inserted
replaced
133 if m and n and not a: # flags set, don't agree, differ from parent |
133 if m and n and not a: # flags set, don't agree, differ from parent |
134 r = repo.ui.promptchoice( |
134 r = repo.ui.promptchoice( |
135 _(" conflicting flags for %s\n" |
135 _(" conflicting flags for %s\n" |
136 "(n)one, e(x)ec or sym(l)ink?") % f, |
136 "(n)one, e(x)ec or sym(l)ink?") % f, |
137 (_("&None"), _("E&xec"), _("Sym&link")), 0) |
137 (_("&None"), _("E&xec"), _("Sym&link")), 0) |
138 if r == 1: return "x" # Exec |
138 if r == 1: |
139 if r == 2: return "l" # Symlink |
139 return "x" # Exec |
|
140 if r == 2: |
|
141 return "l" # Symlink |
140 return "" |
142 return "" |
141 if m and m != a: # changed from a to m |
143 if m and m != a: # changed from a to m |
142 return m |
144 return m |
143 if n and n != a: # changed from a to n |
145 if n and n != a: # changed from a to n |
144 return n |
146 return n |