On Tue, May 17, 2016 at 9:16 AM, Vasily Titskiy <qehgt0@xxxxxxxxx> wrote: > As stash does not know how to deal with submodules, > it should not try to save/restore their states > as it leads to redundant merge conflicts. > > Added test checks if 'stash pop' does not trigger merge conflics /conflics/conflicts/ > in submodules. > > Signed-off-by: Vasily Titskiy <qehgt0@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html