diff .hgtags @ 23655:79235b46062c

merge: extract method for checking for conflicting untracked file Now that the functionality is collected in one place, let's extract it to a method.
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 13 Dec 2014 23:52:22 -0800
parents 71f8c28b9f1b
children e88c08a82edd
line wrap: on
line diff