On Aug 9, 2015, at 8:22 AM, arnoldemu wrote:
The merge is always painful...
...I must go and resolve every little thing including whitespace and empty
lines.
If you’re frequently having merge conflicts due to whitespace changes, you’re
probably editing the repo contents from two or more
Dear ML members,
I had the need for a very simple blog-like page within the embedded doc
functionality where a th1 page (with enabled th1-doc feature) displays a
list with links to all documents within a specific folder. Whenever a
new file gets added to the folder the script will
On Aug 10, 2015, at 10:03 AM, Warren Young w...@etr-usa.com wrote:
make it a habit to say something like “fossil diff | less” to make sure the
changes you *think* you are checking in are the changes you are *actually*
checking in.
Also, you might not be aware that fossil diff has the -w
Thus said Stephan Beal on Fri, 07 Aug 2015 20:16:01 +0200:
Nothing negative, in any case - it's a long overdue feature.
Well, it's done:
http://www.fossil-scm.org/index.html/info/c73c95cc654b50db
Thanks for all the feedback.
Andy
--
TAI64 timestamp: 400055c9751c
On Sun, Aug 9, 2015 at 7:29 AM, Stephan Beal sgb...@googlemail.com wrote:
On Sun, Aug 9, 2015 at 4:22 PM, arnoldemu
mem...@arnoldemu.freeserve.co.uk wrote:
kdiff3 makes it hard work, I must go and resolve every little thing
including whitespace and empty lines. Merging multiple lines is
5 matches
Mail list logo
