[PATCH 5 of 5] rebase: specify custom conflict marker labels for rebase

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri May 9 00:14:36 CDT 2014



On 05/08/2014 05:33 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1399593356 25200
> #      Thu May 08 16:55:56 2014 -0700
> # Node ID 375164d1425477d42f9d5c032465d79727648b17
> # Parent  75ff3fc095cae6dcf513d424b7abb23121cc7e55
> rebase: specify custom conflict marker labels for rebase
>
> Changes rebase conflict markers to say 'source' and 'destination' instead of
> 'local' and 'other'.  This ends up looking like:
>
>    one
>    <<<<<<< destination: a3e5  master - "A commit to master"
>    master
>    =======
>    mine
>    >>>>>>> source: c7fd  - "A commit to my feature branch"
>    three

Destination is a bit long and waste a significant amount of space. We 
could maybe shorten it to `dest:`

Also I feel like using label of the same length would make the markers 
more readable.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list