Mercurial > hg
diff mercurial/merge.py @ 3717:9e248cfd8b94
handle files with more than one git binary patch
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Nov 2006 22:03:36 -0200 |
parents | 6cb3aca69cdc |
children | 0fb66912040a |
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Nov 2006 22:03:36 -0200 |
parents | 6cb3aca69cdc |
children | 0fb66912040a |