Mercurial > hg

diff tests/test-simplemerge.py @ 25155:6ab5a1c9ea3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: drop wifexited polyfill os.WIFEXITED exists as of python 2.6 for me, so we no longer need this polyfill.
author Augie Fackler <augie@google.com>
date Sun, 17 May 2015 21:15:04 -0400
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff