Mercurial > hg
diff Makefile @ 26769:5b00ec4c05cb
merge.mergestate: set merge driver state to 's' if there's none present
This allows mergestate.mdstate() to return 's' if there's nothing to be done on
the merge driver end.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 15 Oct 2015 01:06:29 -0700 |
parents | c5c7c686d6a6 |
children | 7fbab10f812f |