Mercurial > hg
diff tests/test-ancestor.py.out @ 26939:50d2389a2e49
resolve: choose where .orig file locations are kept
Having your working copy littered with .orig files is a common HG complaint.
This patch uses the cmd.origpath helper function to let the user
specify where they should be kept when using the resolve command.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Tue, 10 Nov 2015 14:26:19 -0800 |
parents | 3b1b8f25443e |
children | b6db2e80a9ce |