Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/mdiff.py @ 3122:2ef0b3aae186
merge: simplify actions with helper function
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 21:27:30 -0500 |
parents | d838bfac668d |
children | 096f1c73cdc3 |