Mercurial > hg
view mercurial/help/hgignore.5.txt @ 20233:410193f11422
commands.bookmarks: pass cur in explicitly to checkconflict
cur will be moved inside the wlock in a future patch, so we need to pass it
into checkconflict explicitly.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 21 Nov 2013 17:11:04 -0800 |
parents | 9c963a43ecfb |
children | 8fe5fc8d7b8e |
line wrap: on
line source
========== hgignore ========== --------------------------------- syntax for Mercurial ignore files --------------------------------- :Author: Vadim Gelfer <vadim.gelfer@gmail.com> :Organization: Mercurial :Manual section: 5 :Manual group: Mercurial Manual .. include:: hgignore.5.gendoc.txt Author ====== Vadim Gelfer <vadim.gelfer@gmail.com> Mercurial was written by Matt Mackall <mpm@selenic.com>. See Also ======== |hg(1)|_, |hgrc(5)|_ Copying ======= This manual page is copyright 2006 Vadim Gelfer. Mercurial is copyright 2005-2014 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. .. include:: common.txt