Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3785:1427949b8f80
imported patch folding
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Dec 2006 17:10:29 -0600 |
parents | b1eeaeb936ae |
children | 6398ff7cb705 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Dec 2006 17:10:29 -0600 |
parents | b1eeaeb936ae |
children | 6398ff7cb705 |