Mercurial > hg
comparison hgext/largefiles/remotestore.py @ 21537:1ab30e9ba0fc
update: specify custom conflict markers for update (BC)
Add custom conflict markers 'working copy' and 'destination' for doing hg update
when there are conflicts between your working copy and the destination.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Fri, 09 May 2014 18:09:11 -0700 |
| parents | 70252bdfd39c |
| children | bee00e0c2e45 |
comparison
equal
deleted
inserted
replaced
| 21536:92a6b16c9186 | 21537:1ab30e9ba0fc |
|---|