| commit | 41f44310b35b8246475d707b3417e42a03b1ca05 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 17 Jan 2011 21:18:00 +0000 (17 16:18 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 17 Jan 2011 21:18:00 +0000 (17 16:18 -0500) | ||
| tree | 45eb63415cc44032cc52d572ca2a553c451a8d84 | treesnapshot (tar.gz zip) |
| parent | 61f74651c4d5d7502069263ce763cb8685b81ad8 | commitdiff |
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
an inconsistent state.
an inconsistent state.
| admin/ChangeLog | diffblobblamehistory | |
| admin/bzrmerge.el | diffblobblamehistory |